Changeset 14496 for branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/MemPRAlgorithm.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/MemPRAlgorithm.cs (modified) (5 diffs)

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

@@ -230 +230 @@
         while (Context.PopulationCount < 2) {
           var child = Create(token);
-          Context.HcSteps += HillClimb(child, token);
-          Context.AddToPopulation(child);
-          Analyze(token);
+          Context.LocalSearchEvaluations += HillClimb(child, token);
+          if (Replace(child, token) >= 0)
+            Analyze(token);
           token.ThrowIfCancellationRequested();
           if (Terminate()) return;
         }
-        Context.HcSteps /= 2;
+        Context.LocalSearchEvaluations /= 2;
         Context.Initialized = true;
       }
@@ -262 +262 @@
       int replPos = -1;
 
-      if (Context.Random.NextDouble() > parentDist) {
+      if (Context.Random.NextDouble() > parentDist * parentDist) {
         offspring = BreedAndImprove(p1, p2, token);
         replPos = Replace(offspring, token);
@@ -271 +271 @@
       }
 
-      if (Context.Random.NextDouble() < parentDist) {
+      if (Context.Random.NextDouble() < Math.Sqrt(parentDist)) {
         offspring = RelinkAndImprove(p1, p2, token);
         replPos = Replace(offspring, token);
@@ -299 +299 @@
           offspring = (ISingleObjectiveSolutionScope<TSolution>)Context.AtPopulation(Context.Random.Next(Context.PopulationCount)).Clone();
           Mutate(offspring, token);
-          PerformTabuWalk(offspring, Context.HcSteps, token);
+          PerformTabuWalk(offspring, Context.LocalSearchEvaluations, token);
           replPos = Replace(offspring, token);
           if (replPos >= 0) {
@@ -318 +318 @@
         Results.Add(new Result("Iterations", new IntValue(Context.Iterations)));
       else ((IntValue)res.Value).Value = Context.Iterations;
-      if (!Results.TryGetValue("HcSteps", out res))
-        Results.Add(new Result("HcSteps", new IntValue(Context.HcSteps)));
-      else ((IntValue)res.Value).Value = Context.HcSteps;
+      if (!Results.TryGetValue("LocalSearch Evaluations", out res))
+        Results.Add(new Result("LocalSearch Evaluations", new IntValue(Context.LocalSearchEvaluations)));
+      else ((IntValue)res.Value).Value = Context.LocalSearchEvaluations;
       if (!Results.TryGetValue("ByBreeding", out res))
         Results.Add(new Result("ByBreeding", new IntValue(Context.ByBreeding)));