GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1242:162d6112469c

Updates states of synchronized variables when there is a move operation

Alexandre Leroux -

r1242:162d6112469c

parent child

Context file:

r1242:162d6112469c

plugins/amda/tests/FuzzingDefs.cpp +17 -1

@@ -81,7 +81,8 void FuzzingState::desynchronizeVariable(VariableId variableId, SyncGroupId sync
81	return;	81	return;
82	}	82	}
83		83
84	// Unregisters variable from sync group: if there is no more variable in the group, resets the ~~range~~	84	// Unregisters variable from sync group: if there is no more variable in the group, resets the
		85	// range
85	auto &syncGroup = m_SyncGroupsPool.at(syncGroupId);	86	auto &syncGroup = m_SyncGroupsPool.at(syncGroupId);
86	syncGroup.m_Variables.erase(variableId);	87	syncGroup.m_Variables.erase(variableId);
87	if (syncGroup.m_Variables.empty()) {	88	if (syncGroup.m_Variables.empty()) {
@@ -89,3 +90,18 void FuzzingState::desynchronizeVariable(VariableId variableId, SyncGroupId sync
89	}	90	}
90	}	91	}
91		92
		93	void FuzzingState::updateRanges(VariableId variableId, const SqpRange &newRange)
		94	{
		95	auto syncGroupId = this->syncGroupId(variableId);
		96
		97	// Retrieves the variables to update:
		98	// - if the variable is synchronized to others, updates all synchronized variables
		99	// - otherwise, updates only the variable
		100	auto variablesToUpdate = syncGroupId.isNull() ? std::set<VariableId>{variableId}
		101	: m_SyncGroupsPool.at(syncGroupId).m_Variables;
		102
		103	// Sets new range
		104	for (const auto &variableId : variablesToUpdate) {
		105	m_VariablesPool.at(variableId).m_Range = newRange;
		106	}
		107	}

plugins/amda/tests/FuzzingDefs.h +4 0

                 /// @param syncGroupId the synchronization group from which to remove the variable
                 void desynchronizeVariable(VariableId variableId, SyncGroupId syncGroupId);
+                /// Updates the range of a variable and all variables to which it is synchronized
+                /// @param the variable for which to affect the range
+                /// @param the range to affect
+                void updateRanges(VariableId variableId, const SqpRange &newRange);
                 VariablesPool m_VariablesPool;
                 SyncGroupsPool m_SyncGroupsPool;

plugins/amda/tests/FuzzingOperations.cpp +4 -3

                     auto delta = RandomGenerator::instance().generateDouble(0, deltaMax);
                     // Moves variable to its new range
+                    auto isSynchronized = !fuzzingState.syncGroupId(variableId).isNull();
                     auto newVariableRange = SqpRange{m_RangeStartMoveFun(variableRange.m_TStart, delta),
                                                      m_RangeEndMoveFun(variableRange.m_TEnd, delta)};
                     qCInfo(LOG_FuzzingOperations()).noquote()
                         << "Performing" << m_Label << "on" << variable->name() << "(from" << variableRange
                         << "to" << newVariableRange << ")...";
-                    variableController.onRequestDataLoading({variable}, newVariableRange, false);
+                    variableController.onRequestDataLoading({variable}, newVariableRange, isSynchronized);
-                    // Updates variable's state
+                    // Updates state
-                    variableState.m_Range = newVariableRange;
+                    fuzzingState.updateRanges(variableId, newVariableRange);
                 }
                 MoveFunction m_RangeStartMoveFun;

General Comments 0

You need to be logged in to leave comments. Login now

No TODOs yet

	Repositories
g s	Goto summary page
g c	Goto changelog page
g f	Goto files page
g F	Goto files page with file search activated
g p	Goto pull requests page
g o	Goto repository settings
g O	Goto repository access permissions settings
t s	Toggle sidebar on some pages