Changeset 14666 for branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/MemPRAlgorithm.cs

Timestamp:

02/11/17 01:06:37 (7 years ago)

Author:

abeham

Message:

#2457: copied MemPR algorithm from its branch to this branch

Location:

branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR

Files:

• . (copied) (copied from branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR)
• 3.3/MemPRAlgorithm.cs (modified) (2 diffs)

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

@@ -248 +248 @@
           Context.AddToPopulation(child);
           Context.BestQuality = child.Fitness;
-          Analyze(token);
+          Analyze(CancellationToken.None);
           token.ThrowIfCancellationRequested();
           if (Terminate()) return;
@@ -398 +398 @@
       } else res.Value = sp;
 
-      if (Context.BreedingPerformanceModel != null) {
-        var sol = Context.GetSolution(Context.BreedingPerformanceModel, Context.BreedingStat);
-        if (!Results.TryGetValue("Breeding Performance", out res)) {
-          Results.Add(new Result("Breeding Performance", sol));
-        } else res.Value = sol;
-      }
-      if (Context.RelinkingPerformanceModel != null) {
-        var sol = Context.GetSolution(Context.RelinkingPerformanceModel, Context.RelinkingStat);
-        if (!Results.TryGetValue("Relinking Performance", out res)) {
-          Results.Add(new Result("Relinking Performance", sol));
-        } else res.Value = sol;
-      }
-      if (Context.DelinkingPerformanceModel != null) {
-        var sol = Context.GetSolution(Context.DelinkingPerformanceModel, Context.DelinkingStat);
-        if (!Results.TryGetValue("Delinking Performance", out res)) {
-          Results.Add(new Result("Delinking Performance", sol));
-        } else res.Value = sol;
-      }
-      if (Context.SamplingPerformanceModel != null) {
-        var sol = Context.GetSolution(Context.SamplingPerformanceModel, Context.SamplingStat);
-        if (!Results.TryGetValue("Sampling Performance", out res)) {
-          Results.Add(new Result("Sampling Performance", sol));
-        } else res.Value = sol;
-      }
-      if (Context.HillclimbingPerformanceModel != null) {
-        var sol = Context.GetSolution(Context.HillclimbingPerformanceModel, Context.HillclimbingStat);
-        if (!Results.TryGetValue("Hillclimbing Performance", out res)) {
-          Results.Add(new Result("Hillclimbing Performance", sol));
-        } else res.Value = sol;
-      }
-      if (Context.AdaptiveWalkPerformanceModel != null) {
-        var sol = Context.GetSolution(Context.AdaptiveWalkPerformanceModel, Context.AdaptivewalkingStat);
-        if (!Results.TryGetValue("Adaptivewalk Performance", out res)) {
-          Results.Add(new Result("Adaptivewalk Performance", sol));
-        } else res.Value = sol;
-      }
-
       Context.RunOperator(Analyzer, Context.Scope, token);
     }