Changeset 14496 for branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/MemPRContext.cs

Timestamp:

12/16/16 17:10:05 (7 years ago)

Author:

abeham

Message:

#2701:

• Reusing similiarty calculator in BinaryMemPR
• Fixing distance calculation for linear linkage and LinearLinkageMemPR
• Small changes to base algorithm
• Added biased model trainer for permutation (rank and fitness)
• Fixing best known quality calculation for GCP

File:

• branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/MemPRContext.cs (modified) (3 diffs)

branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/MemPRContext.cs

@@ -102 +102 @@
 
     [Storable]
-    private IValueParameter<IntValue> hcSteps;
-    public int HcSteps {
-      get { return hcSteps.Value.Value; }
-      set { hcSteps.Value.Value = value; }
+    private IValueParameter<IntValue> localSearchEvaluations;
+    public int LocalSearchEvaluations {
+      get { return localSearchEvaluations.Value.Value; }
+      set { localSearchEvaluations.Value.Value = value; }
     }
 
@@ -196 +196 @@
       bestQuality = cloner.Clone(original.bestQuality);
       bestSolution = cloner.Clone(original.bestSolution);
-      hcSteps = cloner.Clone(original.hcSteps);
+      localSearchEvaluations = cloner.Clone(original.localSearchEvaluations);
       byBreeding = cloner.Clone(original.byBreeding);
       byRelinking = cloner.Clone(original.byRelinking);
@@ -219 +219 @@
       Parameters.Add(bestQuality = new ValueParameter<DoubleValue>("BestQuality", new DoubleValue(double.NaN)));
       Parameters.Add(bestSolution = new ValueParameter<TSolution>("BestSolution"));
-      Parameters.Add(hcSteps = new ValueParameter<IntValue>("HcSteps", new IntValue(0)));
+      Parameters.Add(localSearchEvaluations = new ValueParameter<IntValue>("LocalSearchEvaluations", new IntValue(0)));
       Parameters.Add(byBreeding = new ValueParameter<IntValue>("ByBreeding", new IntValue(0)));
       Parameters.Add(byRelinking = new ValueParameter<IntValue>("ByRelinking", new IntValue(0)));