Changeset 3626 for trunk/sources/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingMainLoop.cs

Timestamp:

05/05/10 11:34:35 (14 years ago)

Author:

abeham

Message:

Fixed build break in ES, LS, and SA due to Analyzer changes #999

File:

• trunk/sources/HeuristicLab.Algorithms.SimulatedAnnealing/3.3/SimulatedAnnealingMainLoop.cs (modified) (4 diffs)

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

@@ -116 +116 @@
       VariableCreator variableCreator = new VariableCreator();
       ResultsCollector resultsCollector1 = new ResultsCollector();
+      SubScopesProcessor subScopesProcessor0 = new SubScopesProcessor();
       Placeholder analyzer1 = new Placeholder();
       SubScopesProcessor sssp = new SubScopesProcessor();
@@ -131 +132 @@
       Comparator iterationsComparator = new Comparator();
       ResultsCollector resultsCollector2 = new ResultsCollector();
+      SubScopesProcessor subScopesProcessor1 = new SubScopesProcessor();
       Placeholder analyzer2 = new Placeholder();
       ConditionalBranch iterationsTermination = new ConditionalBranch();
@@ -189 +191 @@
       OperatorGraph.InitialOperator = variableCreator;
       variableCreator.Successor = resultsCollector1;
-      resultsCollector1.Successor = analyzer1;
-      analyzer1.Successor = sssp;
+      resultsCollector1.Successor = subScopesProcessor0;
+      subScopesProcessor0.Operators.Add(analyzer1);
+      subScopesProcessor0.Successor = sssp;
       sssp.Operators.Add(resultsCollector);
       resultsCollector.Successor = null;
@@ -205 +208 @@
       iterationsCounter.Successor = iterationsComparator;
       iterationsComparator.Successor = resultsCollector2;
-      resultsCollector2.Successor = analyzer2;
-      analyzer2.Successor = iterationsTermination;
+      resultsCollector2.Successor = subScopesProcessor1;
+      subScopesProcessor1.Operators.Add(analyzer2);
+      subScopesProcessor1.Successor = iterationsTermination;
       iterationsTermination.TrueBranch = null;
       iterationsTermination.FalseBranch = annealingOperator;