Changeset 12810 for trunk/sources/HeuristicLab.Problems.QuadraticAssignment.Algorithms

Timestamp:

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

Author:

abeham

Message:

#2444: Added evaluation output to RTS

Location:

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

Files:

• RobustTabooSeachOperator.cs (modified) (5 diffs)
• RobustTabooSearch.cs (modified) (3 diffs)

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

@@ -90 +90 @@
     private ILookupParameter<BoolValue> AllMovesTabuParameter {
       get { return (ILookupParameter<BoolValue>)Parameters["AllMovesTabu"]; }
+    }
+
+    public ILookupParameter<IntValue> EvaluatedMovesParameter {
+      get { return (ILookupParameter<IntValue>)Parameters["EvaluatedMoves"]; }
     }
     #endregion
@@ -117 +121 @@
       Parameters.Add(new ValueLookupParameter<IntValue>("AlternativeAspirationTenure", "The time t that a move will be remembered for the alternative aspiration condition."));
       Parameters.Add(new LookupParameter<BoolValue>("AllMovesTabu", "Indicates that all moves are tabu."));
+      Parameters.Add(new LookupParameter<IntValue>("EvaluatedMoves", "The number of move evaluations made."));
     }
 
@@ -129 +134 @@
       if (!Parameters.ContainsKey("AllMovesTabu")) {
         Parameters.Add(new LookupParameter<BoolValue>("AllMovesTabu", "Indicates that all moves are tabu."));
+      }
+      if (!Parameters.ContainsKey("EvaluatedMoves")) {
+        Parameters.Add(new LookupParameter<IntValue>("EvaluatedMoves", "The number of move evaluations made."));
       }
       #endregion
@@ -163 +171 @@
       bool already_aspired = false;
 
+      var evaluatedMoves = 0;
       foreach (Swap2Move move in ExhaustiveSwap2MoveGenerator.Generate(solution)) {
         double moveQuality;
-        if (lastMove == null)
+        if (lastMove == null) {
           moveQuality = QAPSwap2MoveEvaluator.Apply(solution, move, weights, distances);
-        else if (allMovesTabu) moveQuality = moveQualityMatrix[move.Index1, move.Index2];
-        else moveQuality = QAPSwap2MoveEvaluator.Apply(solution, move, moveQualityMatrix[move.Index1, move.Index2], weights, distances, lastMove);
+          evaluatedMoves++;
+        } else if (allMovesTabu) moveQuality = moveQualityMatrix[move.Index1, move.Index2];
+        else {
+          moveQuality = QAPSwap2MoveEvaluator.Apply(solution, move, moveQualityMatrix[move.Index1, move.Index2], weights, distances, lastMove);
+          evaluatedMoves++;
+        }
 
         moveQualityMatrix[move.Index1, move.Index2] = moveQuality;
@@ -200 +213 @@
         }
       }
+
+      EvaluatedMovesParameter.ActualValue.Value += evaluatedMoves;
 
       allMovesTabu = bestMove == null;

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;