Changeset 12810 for trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3/RobustTabooSearch.cs

Timestamp:

07/30/15 14:56:55 (9 years ago)

Author:

abeham

Message:

#2444: Added evaluation output to RTS

File:

• trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3/RobustTabooSearch.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Algorithms/3.3/RobustTabooSearch.cs

@@ -168 +168 @@
       VariableCreator variableCreator = new VariableCreator();
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("EvaluatedSolutions", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("EvaluatedMoves", new IntValue(0)));
 
       ResultsCollector resultsCollector = new ResultsCollector();
       resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Iterations", "The actual iteration."));
+      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("EvaluatedSolutions", "The number of full solution evaluations."));
+      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("EvaluatedMoves", "The number of move evaluations."));
 
       solutionsCreator = new SolutionsCreator();
       solutionsCreator.NumberOfSolutions = new IntValue(1);
+
+      IntCounter counter = new IntCounter();
+      counter.ValueParameter.ActualName = "EvaluatedSolutions";
+      counter.Increment = new IntValue(1);
 
       Placeholder analyzer = new Placeholder();
@@ -194 +202 @@
       mainOperator.ShortTermMemoryParameter.ActualName = "ShortTermMemory";
       mainOperator.UseAlternativeAspirationParameter.ActualName = UseAlternativeAspirationParameter.Name;
+      mainOperator.EvaluatedMovesParameter.ActualName = "EvaluatedMoves";
 
       ConditionalBranch qualityStopBranch = new ConditionalBranch();
@@ -226 +235 @@
       variableCreator.Successor = resultsCollector;
       resultsCollector.Successor = solutionsCreator;
-      solutionsCreator.Successor = analyzer;
+      solutionsCreator.Successor = counter;
+      counter.Successor = analyzer;
       analyzer.Successor = ussp;
       ussp.Operator = mainOperator;