Changeset 5609 for branches/VNS/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearchMainLoop.cs

Timestamp:

03/04/11 17:23:40 (14 years ago)

Author:

svonolfe

Message:

Worked on VNS main loop (#1425)

File:

• branches/VNS/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearchMainLoop.cs (modified) (7 diffs)

branches/VNS/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3/VariableNeighborhoodSearchMainLoop.cs

@@ -126 +126 @@
       QualityComparator qualityComparator = new QualityComparator();
       ConditionalBranch improvesQualityBranch = new ConditionalBranch();
+      ConditionalBranch improvesQualityBranch2 = new ConditionalBranch();
 
       Assigner bestQualityUpdater = new Assigner();
@@ -134 +135 @@
       Assigner indexResetter = new Assigner();
 
-      SubScopesRemover remover = new SubScopesRemover();
+      SubScopesRemover remover1 = new SubScopesRemover();
+      SubScopesRemover remover2 = new SubScopesRemover();
       Placeholder analyzer2 = new Placeholder();
 
@@ -145 +147 @@
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations", new IntValue(0)));
       variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("Index", new DoubleValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<BoolValue>("Continue", new BoolValue(false)));
       variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("BestQuality", new DoubleValue(0)));
 
@@ -183 +186 @@
       evaluator.OperatorParameter.ActualName = EvaluatorParameter.Name;
 
-      qualityComparator.LeftSideParameter.ActualName = "OriginalQuality";
-      qualityComparator.RightSideParameter.ActualName = QualityParameter.Name;
+      qualityComparator.LeftSideParameter.ActualName = QualityParameter.Name;
+      qualityComparator.RightSideParameter.ActualName = "OriginalQuality";
       qualityComparator.ResultParameter.ActualName = "IsBetter";
 
       improvesQualityBranch.ConditionParameter.ActualName = "IsBetter";
+      improvesQualityBranch2.ConditionParameter.ActualName = "IsBetter";
 
       bestQualityUpdater.Name = "Update BestQuality";
@@ -194 +198 @@
 
       cleaner.Name = "Clean scope";
+      cleaner.ClearSubScopesParameter.Value = new BoolValue(false);
       originalRestorer.Name = "Restore original solution";
 
@@ -204 +209 @@
       indexResetter.RightSideParameter.Value = new IntValue(0);
 
-      remover.Name = "Remove subscope";
+      remover1.Name = remover2.Name = "Remove subscope";
 
       analyzer2.Name = "Analyzer (placeholder)";
@@ -253 +258 @@
       improvesQualityBranch.TrueBranch = bestQualityUpdater;
       improvesQualityBranch.FalseBranch = cleaner;
-      improvesQualityBranch.Successor = remover;
 
       bestQualityUpdater.Successor = indexResetter;
+      indexResetter.Successor = remover1;
 
       cleaner.Successor = originalRestorer;
-      originalRestorer.Successor = indexCounter;
+      originalRestorer.Successor = remover2;
+      remover2.Successor = indexCounter;
       /////////
-      indexTermination.TrueBranch = null;
-      indexTermination.FalseBranch = iterationInit;
+      indexTermination.TrueBranch = improvesQualityBranch2;
+      indexTermination.FalseBranch = null;
+
+      improvesQualityBranch2.TrueBranch = null;
+      improvesQualityBranch2.FalseBranch = createChild;
 
       iterationsCounter.Successor = iterationsComparator;