Changeset 5356 for trunk/sources/HeuristicLab.Algorithms.SimulatedAnnealing

Timestamp:

01/22/11 15:18:20 (14 years ago)

Author:

abeham

Message:

#1344

• Adapted all algorithms to count evaluated solutions / moves and outside of the parallel region
• Used the same pattern in every algorithm: Initialize and collect the variable in the Algorithm and increment it in the main loops and main operators

Location:

trunk/sources/HeuristicLab.Algorithms.SimulatedAnnealing/3.3

Files:

• SimulatedAnnealing.cs (modified) (5 diffs)
• SimulatedAnnealingMainLoop.cs (modified) (8 diffs)

trunk/sources/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealing.cs

@@ -27 +27 @@
 using HeuristicLab.Core;
 using HeuristicLab.Data;
+using HeuristicLab.Operators;
 using HeuristicLab.Optimization;
 using HeuristicLab.Optimization.Operators;
@@ -135 +136 @@
     }
     private SimulatedAnnealingMainLoop MainLoop {
-      get { return (SimulatedAnnealingMainLoop)SolutionsCreator.Successor; }
+      get {
+        return (SimulatedAnnealingMainLoop)(
+          (ResultsCollector)(
+            (VariableCreator)SolutionsCreator.Successor
+          ).Successor
+        ).Successor;
+      }
     }
     [Storable]
@@ -171 +178 @@
       RandomCreator randomCreator = new RandomCreator();
       SolutionsCreator solutionsCreator = new SolutionsCreator();
+      VariableCreator variableCreator = new VariableCreator();
+      ResultsCollector resultsCollector = new ResultsCollector();
       SimulatedAnnealingMainLoop mainLoop = new SimulatedAnnealingMainLoop();
       OperatorGraph.InitialOperator = randomCreator;
@@ -182 +191 @@
 
       solutionsCreator.NumberOfSolutions = new IntValue(1);
-      solutionsCreator.Successor = mainLoop;
+      solutionsCreator.Successor = variableCreator;
+
+      variableCreator.Name = "Initialize EvaluatedMoves";
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("EvaluatedMoves", new IntValue()));
+      variableCreator.Successor = resultsCollector;
+
+      resultsCollector.CollectedValues.Add(new LookupParameter<IntValue>("Evaluated Moves", null, "EvaluatedMoves"));
+      resultsCollector.ResultsParameter.ActualName = "Results";
+      resultsCollector.Successor = mainLoop;
 
       mainLoop.MoveGeneratorParameter.ActualName = MoveGeneratorParameter.Name;
@@ -194 +211 @@
       mainLoop.ResultsParameter.ActualName = "Results";
       mainLoop.AnalyzerParameter.ActualName = AnalyzerParameter.Name;
+      mainLoop.EvaluatedMovesParameter.ActualName = "EvaluatedMoves";
 
       foreach (IDiscreteDoubleValueModifier op in ApplicationManager.Manager.GetInstances<IDiscreteDoubleValueModifier>().OrderBy(x => x.Name))

trunk/sources/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingMainLoop.cs

@@ -80 +80 @@
     public ValueLookupParameter<VariableCollection> ResultsParameter {
       get { return (ValueLookupParameter<VariableCollection>)Parameters["Results"]; }
+    }
+    public LookupParameter<IntValue> EvaluatedMovesParameter {
+      get { return (LookupParameter<IntValue>)Parameters["EvaluatedMoves"]; }
     }
     #endregion
@@ -115 +118 @@
       Parameters.Add(new ValueLookupParameter<IOperator>("Analyzer", "The operator used to analyze each generation."));
       Parameters.Add(new ValueLookupParameter<VariableCollection>("Results", "The variable collection where results should be stored."));
+      Parameters.Add(new LookupParameter<IntValue>("EvaluatedMoves", "The number of evaluated moves."));
       #endregion
 
@@ -129 +133 @@
       UniformSubScopesProcessor moveEvaluationProcessor = new UniformSubScopesProcessor();
       Placeholder moveEvaluator = new Placeholder();
+      SubScopesCounter subScopesCounter = new SubScopesCounter();
       ProbabilisticQualityComparator qualityComparator = new ProbabilisticQualityComparator();
       ConditionalBranch improvesQualityBranch = new ConditionalBranch();
@@ -135 +140 @@
       IntCounter iterationsCounter = new IntCounter();
       Comparator iterationsComparator = new Comparator();
-      ResultsCollector resultsCollector2 = new ResultsCollector();
       SubScopesProcessor subScopesProcessor1 = new SubScopesProcessor();
       Placeholder analyzer2 = new Placeholder();
@@ -158 +162 @@
       moveEvaluator.Name = "Move evaluator (placeholder)";
       moveEvaluator.OperatorParameter.ActualName = MoveEvaluatorParameter.Name;
+
+      subScopesCounter.Name = "Increment EvaluatedMoves";
+      subScopesCounter.ValueParameter.ActualName = EvaluatedMovesParameter.Name;
 
       qualityComparator.LeftSideParameter.ActualName = MoveQualityParameter.Name;
@@ -180 +187 @@
       iterationsComparator.ResultParameter.ActualName = "Terminate";
       iterationsComparator.Comparison.Value = ComparisonType.GreaterOrEqual;
-
-      resultsCollector2.CollectedValues.Add(new LookupParameter<IntValue>("Iterations"));
-      resultsCollector2.CollectedValues.Add(new LookupParameter<DoubleValue>("Temperature"));
-      resultsCollector2.ResultsParameter.ActualName = ResultsParameter.Name;
 
       analyzer2.Name = "Analyzer (placeholder)";
@@ -198 +201 @@
       subScopesProcessor0.Operators.Add(analyzer1);
       subScopesProcessor0.Successor = sssp;
+      analyzer1.Successor = null;
       sssp.Operators.Add(resultsCollector);
+      sssp.Successor = annealingOperator;
       resultsCollector.Successor = null;
-      sssp.Successor = annealingOperator;
       annealingOperator.Successor = mainProcessor;
       mainProcessor.Operator = moveGenerator;
@@ -206 +210 @@
       moveGenerator.Successor = moveEvaluationProcessor;
       moveEvaluationProcessor.Operator = moveEvaluator;
-      moveEvaluationProcessor.Successor = subScopesRemover;
+      moveEvaluationProcessor.Successor = subScopesCounter;
       moveEvaluator.Successor = qualityComparator;
       qualityComparator.Successor = improvesQualityBranch;
       improvesQualityBranch.TrueBranch = moveMaker;
+      improvesQualityBranch.FalseBranch = null;
+      improvesQualityBranch.Successor = null;
+      moveMaker.Successor = null;
+      subScopesCounter.Successor = subScopesRemover;
+      subScopesRemover.Successor = null;
       iterationsCounter.Successor = iterationsComparator;
-      iterationsComparator.Successor = resultsCollector2;
-      resultsCollector2.Successor = subScopesProcessor1;
+      iterationsComparator.Successor = subScopesProcessor1;
       subScopesProcessor1.Operators.Add(analyzer2);
       subScopesProcessor1.Successor = iterationsTermination;