Changeset 5610 for branches/VNS

Timestamp:

03/04/11 18:27:23 (14 years ago)

Author:

svonolfe

Message:

Worked on VNS main loop (#1425)

Location:

branches/VNS/HeuristicLab.Algorithms.VariableNeighborhoodSearch/3.3

Files:

• LocalSearchImprovement.cs (modified) (1 diff)
• VariableNeighborhoodSearchMainLoop.cs (modified) (4 diffs)

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

@@ -163 +163 @@
 
       loop.MoveGeneratorParameter.Value = MoveGeneratorParameter.Value;
+      if (loop.MoveGeneratorParameter.Value != null && loop.MoveGeneratorParameter.Value.Parameters.ContainsKey("SampleSize")) {
+        IParameter parameter = loop.MoveGeneratorParameter.Value.Parameters["SampleSize"];
+        if(parameter is IValueParameter)
+          (parameter as IValueParameter).Value = SampleSizeParameter.Value;
+      }
       loop.MoveEvaluatorParameter.Value = MoveEvaluatorParameter.Value;
       loop.MoveMakerParameter.Value = MoveMakerParameter.Value;

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

@@ -145 +145 @@
       ConditionalBranch iterationsTermination = new ConditionalBranch();
 
-      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations", new IntValue(0)));
+      variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("OuterIterations", 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<BoolValue>("IsBetter", new BoolValue(false)));
       variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("BestQuality", new DoubleValue(0)));
 
@@ -158 +159 @@
 
       resultsCollector1.CopyValue = new BoolValue(false);
-      resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>("Iterations"));
+      resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>("OuterIterations"));
       resultsCollector1.CollectedValues.Add(new LookupParameter<DoubleValue>("Best Quality", null, "BestQuality"));
       resultsCollector1.ResultsParameter.ActualName = ResultsParameter.Name;
@@ -218 +219 @@
       iterationsCounter.Name = "Iterations Counter";
       iterationsCounter.Increment = new IntValue(1);
-      iterationsCounter.ValueParameter.ActualName = "Iterations";
+      iterationsCounter.ValueParameter.ActualName = "OuterIterations";
 
       iterationsComparator.Name = "Iterations >= MaximumIterations";
       iterationsComparator.Comparison = new Comparison(ComparisonType.GreaterOrEqual);
-      iterationsComparator.LeftSideParameter.ActualName = "Iterations";
+      iterationsComparator.LeftSideParameter.ActualName = "OuterIterations";
       iterationsComparator.RightSideParameter.ActualName = MaximumIterationsParameter.Name;
       iterationsComparator.ResultParameter.ActualName = "Terminate";
@@ -242 +243 @@
       /////////
       resultsCollector1.Successor = iteration;
+
       iteration.OperatorGraph.InitialOperator = iterationInit;
       iteration.Successor = iterationsCounter;