Changeset 6046 for branches/histogram/HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchMainLoop.cs

Timestamp:

04/23/11 10:00:31 (13 years ago)

Author:

abeham

Message:

#1465

• updated branch with trunk changes

Location:

branches/histogram

Files:

• . (modified) (2 props)
• HeuristicLab.Algorithms.LocalSearch/3.3/LocalSearchMainLoop.cs (modified) (9 diffs)

branches/histogram

@@ -10 +10 @@
 protoc.exe
 HeuristicLab 3.3.5.1.ReSharper.user
+*.psess
+*.vsp

@@ -10 +10 @@
 protoc.exe
 HeuristicLab 3.3.5.1.ReSharper.user
+*.psess
+*.vsp

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

@@ -46 +46 @@
       get { return (LookupParameter<DoubleValue>)Parameters["Quality"]; }
     }
-    public LookupParameter<DoubleValue> BestQualityParameter {
+    public LookupParameter<DoubleValue> BestLocalQualityParameter {
       get { return (LookupParameter<DoubleValue>)Parameters["BestLocalQuality"]; }
     }
@@ -56 +56 @@
     }
     public LookupParameter<IntValue> IterationsParameter {
-      get { return (LookupParameter<IntValue>)Parameters["LocalIterations"]; }
+      get { return (LookupParameter<IntValue>)Parameters["Iterations"]; }
     }
     public ValueLookupParameter<IntValue> MaximumIterationsParameter {
@@ -85 +85 @@
     public LocalSearchMainLoop()
       : base() {
-        Initialize();
+      Initialize();
     }
     private LocalSearchMainLoop(LocalSearchMainLoop original, Cloner cloner)
@@ -100 +100 @@
       Parameters.Add(new LookupParameter<DoubleValue>("Quality", "The value which represents the quality of a solution."));
       Parameters.Add(new LookupParameter<DoubleValue>("BestLocalQuality", "The value which represents the best quality found so far."));
-      Parameters.Add(new ValueLookupParameter<DoubleValue>("BestKnownQuality", "The best known quality value found so far."));
+      Parameters.Add(new ValueLookupParameter<DoubleValue>("BestKnownQuality", "The problem's best known quality value found so far."));
       Parameters.Add(new LookupParameter<DoubleValue>("MoveQuality", "The value which represents the quality of a move."));
-      Parameters.Add(new LookupParameter<IntValue>("LocalIterations", "The number of generations."));
+      Parameters.Add(new LookupParameter<IntValue>("Iterations", "The number of iterations performed."));
       Parameters.Add(new ValueLookupParameter<IntValue>("MaximumIterations", "The maximum number of generations which should be processed."));
       Parameters.Add(new ValueLookupParameter<VariableCollection>("Results", "The variable collection where results should be stored."));
@@ -140 +140 @@
 
       bestQualityInitializer.Name = "Initialize BestQuality";
-      bestQualityInitializer.LeftSideParameter.ActualName = BestQualityParameter.Name;
+      bestQualityInitializer.LeftSideParameter.ActualName = BestLocalQualityParameter.Name;
       bestQualityInitializer.RightSideParameter.ActualName = QualityParameter.Name;
 
@@ -148 +148 @@
       resultsCollector1.CopyValue = new BoolValue(false);
       resultsCollector1.CollectedValues.Add(new LookupParameter<IntValue>(IterationsParameter.Name));
-      resultsCollector1.CollectedValues.Add(new LookupParameter<DoubleValue>(BestQualityParameter.Name, null, BestQualityParameter.Name));
+      resultsCollector1.CollectedValues.Add(new LookupParameter<DoubleValue>(BestLocalQualityParameter.Name, null, BestLocalQualityParameter.Name));
       resultsCollector1.ResultsParameter.ActualName = ResultsParameter.Name;
 
@@ -177 +177 @@
 
       bestQualityUpdater.Name = "Update BestQuality";
-      bestQualityUpdater.LeftSideParameter.ActualName = BestQualityParameter.Name;
+      bestQualityUpdater.LeftSideParameter.ActualName = BestLocalQualityParameter.Name;
       bestQualityUpdater.RightSideParameter.ActualName = QualityParameter.Name;
 
       resultsCollector2.CopyValue = new BoolValue(false);
-      resultsCollector2.CollectedValues.Add(new LookupParameter<DoubleValue>(BestQualityParameter.Name, null, BestQualityParameter.Name));
+      resultsCollector2.CollectedValues.Add(new LookupParameter<DoubleValue>(BestLocalQualityParameter.Name, null, BestLocalQualityParameter.Name));
       resultsCollector2.ResultsParameter.ActualName = ResultsParameter.Name;
 
@@ -204 +204 @@
 
       #region Create operator graph
-      OperatorGraph.InitialOperator = subScopesProcessor0;
+      OperatorGraph.InitialOperator = subScopesProcessor0; // don't change this without adapting the constructor of LocalSearchImprovementOperator
       subScopesProcessor0.Operators.Add(bestQualityInitializer);
       subScopesProcessor0.Successor = resultsCollector1;
@@ -243 +243 @@
       return base.Apply();
     }
+
+    [StorableHook(HookType.AfterDeserialization)]
+    private void AfterDeserialization() {
+      // BackwardsCompatibility3.3
+      #region Backwards compatible code, remove with 3.4
+      if (!Parameters.ContainsKey("BestLocalQuality"))
+        Parameters.Add(new LookupParameter<DoubleValue>("BestLocalQuality", "The value which represents the best quality found so far."));
+      if (!Parameters.ContainsKey("Iterations"))
+        Parameters.Add(new LookupParameter<IntValue>("Iterations", "The number of iterations performed."));
+      #endregion
+    }
   }
 }

@@ -10 +10 @@
 protoc.exe
 HeuristicLab 3.3.5.1.ReSharper.user
+*.psess
+*.vsp