Changeset 5622 for branches/VNS/HeuristicLab.Algorithms.LocalSearch

Timestamp:

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

Author:

svonolfe

Message:

Worked on VNS (#1425)

Location:

branches/VNS/HeuristicLab.Algorithms.LocalSearch/3.3

Files:

• HeuristicLab.Algorithms.LocalSearch-3.3.csproj (modified) (2 diffs)
• LocalSearchImprovement.cs (added)
• LocalSearchMainLoop.cs (modified) (6 diffs)

branches/VNS/HeuristicLab.Algorithms.LocalSearch/3.3/HeuristicLab.Algorithms.LocalSearch-3.3.csproj

@@ -12 +12 @@
     <AssemblyName>HeuristicLab.Algorithms.LocalSearch-3.3</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile></TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
@@ -107 +108 @@
   <ItemGroup>
     <Compile Include="HeuristicLabAlgorithmsLocalSearchPlugin.cs" />
+    <Compile Include="LocalSearchImprovement.cs" />
     <Compile Include="LocalSearchMainLoop.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

branches/VNS/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchMainLoop.cs

@@ -79 +79 @@
     public LocalSearchMainLoop()
       : base() {
-      Initialize();
+      Initialize(false);
+    }
+    public LocalSearchMainLoop(BoolValue nested)
+      : base() {
+      Initialize(nested.Value);
     }
     private LocalSearchMainLoop(LocalSearchMainLoop original, Cloner cloner)
@@ -88 +92 @@
     }
 
-    private void Initialize() {
+    private void Initialize(bool nested) {
       #region Create parameters
       Parameters.Add(new ValueLookupParameter<IRandom>("Random", "A pseudo random number generator."));
@@ -132 +136 @@
 
       variableCreator.CollectedValues.Add(new ValueParameter<IntValue>("Iterations", new IntValue(0))); // Class LocalSearch expects this to be called Iterations
-      variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("BestQuality", new DoubleValue(0)));
+      if (!nested) {
+        variableCreator.CollectedValues.Add(new ValueParameter<DoubleValue>("BestQuality", new DoubleValue(0)));
+      }
 
       bestQualityInitializer.Name = "Initialize BestQuality";
@@ -143 +149 @@
       resultsCollector1.CopyValue = new BoolValue(false);
       resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>("Iterations"));
-      resultsCollector1.CollectedValues.Add(new LookupParameter<DoubleValue>("Best Quality", null, "BestQuality"));
+      if (!nested) {
+        resultsCollector1.CollectedValues.Add(new LookupParameter<DoubleValue>("Best Quality", null, "BestQuality"));
+      }
       resultsCollector1.ResultsParameter.ActualName = ResultsParameter.Name;
 
@@ -197 +205 @@
       OperatorGraph.InitialOperator = variableCreator;
       variableCreator.Successor = subScopesProcessor0;
-      subScopesProcessor0.Operators.Add(bestQualityInitializer);
+      if (!nested) {
+        subScopesProcessor0.Operators.Add(bestQualityInitializer);
+      } else {
+        subScopesProcessor0.Operators.Add(analyzer1);
+      }
       subScopesProcessor0.Successor = resultsCollector1;
       bestQualityInitializer.Successor = analyzer1;
@@ -218 +230 @@
       improvesQualityBranch.FalseBranch = null;
       improvesQualityBranch.Successor = null;
-      moveMaker.Successor = bestQualityUpdater;
+      if (!nested) {
+        moveMaker.Successor = bestQualityUpdater;
+      } else {
+        moveMaker.Successor = null; 
+      }
       bestQualityUpdater.Successor = null;
       mergingReducer.Successor = analyzer2;