GIT_REPOSITORIES/LPP/Users/mperrinel/SciQLop-fork Commit - r1249:b9a47ff1b9cc

Adds the ability to force an acquisition pending for an operation (1)...

Alexandre Leroux -

r1249:b9a47ff1b9cc

parent child

Context file:

r1249:b9a47ff1b9cc

Collapse all files

plugins/amda/tests/FuzzingOperations.h 0 -3

                  static std::unique_ptr<IFuzzingOperation> create(FuzzingOperationType type);
              };
-             using WeightedOperationsTypes = std::map<FuzzingOperationType, double>;
-             Q_DECLARE_METATYPE(WeightedOperationsTypes)
              #endif // SCIQLOP_FUZZINGOPERATIONS_H

plugins/amda/tests/TestAmdaFuzzing.cpp +18 -10

              using Weight = double;
              using Weights = std::vector<Weight>;
+             struct OperationProperty {
+                 Weight m_Weight{1.};
+                 bool m_WaitAcquisition{false};
+             };
              using VariableOperation = std::pair<VariableId, std::shared_ptr<IFuzzingOperation> >;
              using VariablesOperations = std::vector<VariableOperation>;
-             using WeightedOperationsPool = std::map<std::shared_ptr<IFuzzingOperation>, Weight>;
+             using OperationsTypes = std::map<FuzzingOperationType, OperationProperty>;
+             using OperationsPool = std::map<std::shared_ptr<IFuzzingOperation>, OperationProperty>;
              using Validators = std::vector<std::shared_ptr<IFuzzingValidator> >;
              // ///////// //
              /// Goes through the variables pool and operations pool to determine the set of {variable/operation}
              /// pairs that are valid (i.e. operation that can be executed on variable)
-             std::pair<VariablesOperations, Weights>
-             availableOperations(const FuzzingState &fuzzingState, const WeightedOperationsPool &operationsPool)
+             std::pair<VariablesOperations, Weights> availableOperations(const FuzzingState &fuzzingState,
+                                                                         const OperationsPool &operationsPool)
              {
                  VariablesOperations result{};
                  Weights weights{};
                      for (const auto &operationsPoolEntry : operationsPool) {
                          auto operation = operationsPoolEntry.first;
-                         auto weight = operationsPoolEntry.second;
+                         auto operationProperty = operationsPoolEntry.second;
                          // A pair is valid if the current operation can be executed on the current variable
                          if (operation->canExecute(variableId, fuzzingState)) {
                              result.push_back({variableId, operation});
-                             weights.push_back(weight);
+                             weights.push_back(operationProperty.m_Weight);
                          }
                      }
                  }
                  return {result, weights};
              }
-             WeightedOperationsPool createOperationsPool(const WeightedOperationsTypes &types)
+             OperationsPool createOperationsPool(const OperationsTypes &types)
              {
-                 WeightedOperationsPool result{};
+                 OperationsPool result{};
                  std::transform(
                      types.cbegin(), types.cend(), std::inserter(result, result.end()), [](const auto &type) {
                  }
              private:
-                 WeightedOperationsPool operationsPool() const
+                 OperationsPool operationsPool() const
                  {
                      static auto result = createOperationsPool(
                          m_Properties.value(AVAILABLE_OPERATIONS_PROPERTY, AVAILABLE_OPERATIONS_DEFAULT_VALUE)
-                             .value<WeightedOperationsTypes>());
+                             .value<OperationsTypes>());
                      return result;
                  }
              } // namespace
+             Q_DECLARE_METATYPE(OperationsTypes)
              class TestAmdaFuzzing : public QObject {
                  Q_OBJECT

General Comments 0

Write
Preview

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

No TODOs yet

	Site-wide shortcuts
/	Use quick search box
g h	Goto home page
g g	Goto my private gists page
g G	Goto my public gists page
g 0-9	Goto bookmarked items from 0-9
n r	New repository page
n g	New gist page

	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