Changeset 14678 for branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/MemPRContext.cs

Timestamp:

02/17/17 12:51:44 (7 years ago)

Author:

abeham

Message:

#2457: worked on problem instance detection

File:

• branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/MemPRContext.cs (modified) (6 diffs)

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

@@ -25 +25 @@
 using System.Runtime.CompilerServices;
 using System.Threading;
-using HeuristicLab.Algorithms.DataAnalysis;
 using HeuristicLab.Algorithms.MemPR.Interfaces;
-using HeuristicLab.Analysis;
+using HeuristicLab.Analysis.FitnessLandscape;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -34 +33 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
-using HeuristicLab.Problems.DataAnalysis;
 using HeuristicLab.Random;
 using ExecutionContext = HeuristicLab.Core.ExecutionContext;
@@ -167 +165 @@
 
     [Storable]
+    private IValueParameter<DirectedPath<TSolution>> relinkedPaths;
+    public DirectedPath<TSolution> RelinkedPaths {
+      get { return relinkedPaths.Value; }
+      set { relinkedPaths.Value = value; }
+    }
+
+    [Storable]
     private IValueParameter<IRandom> random;
     public IRandom Random {
@@ -221 +226 @@
     public IEnumerable<Tuple<double, double>> AdaptivewalkingStat {
       get { return adaptivewalkingStat; }
+    }
+
+    public double AverageQuality {
+      get {
+        return Problem.Parameters.ContainsKey("AverageQuality")
+          ? ((IValueParameter<DoubleValue>)Problem.Parameters["AverageQuality"]).Value.Value
+          : double.NaN;
+      }
+    }
+
+    public double LowerBound {
+      get {
+        return Problem.Parameters.ContainsKey("LowerBound")
+          ? ((IValueParameter<DoubleValue>)Problem.Parameters["LowerBound"]).Value.Value
+          : double.NaN;
+      }
     }
 
@@ -245 +266 @@
       byHillclimbing = cloner.Clone(original.byHillclimbing);
       byAdaptivewalking = cloner.Clone(original.byAdaptivewalking);
+      relinkedPaths = cloner.Clone(original.relinkedPaths);
       random = cloner.Clone(original.random);
       breedingStat = original.breedingStat.Select(x => Tuple.Create(x.Item1, x.Item2, x.Item3, x.Item4)).ToList();
@@ -273 +295 @@
       Parameters.Add(byHillclimbing = new ValueParameter<IntValue>("ByHillclimbing", new IntValue(0)));
       Parameters.Add(byAdaptivewalking = new ValueParameter<IntValue>("ByAdaptivewalking", new IntValue(0)));
+      Parameters.Add(relinkedPaths = new ValueParameter<DirectedPath<TSolution>>("RelinkedPaths", new DirectedPath<TSolution>()));
       Parameters.Add(random = new ValueParameter<IRandom>("Random", new MersenneTwister()));