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

Timestamp:

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

Author:

abeham

Message:

#2457: worked on problem instance detection

Location:

branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3

Files:

• HeuristicLab.Algorithms.MemPR-3.3.csproj (modified) (1 diff)
• MemPRContext.cs (modified) (6 diffs)
• Permutation/PermutationMemPR.cs (modified) (3 diffs)

branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/HeuristicLab.Algorithms.MemPR-3.3.csproj

@@ -192 +192 @@
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\HeuristicLab.Analysis.FitnessLandscape\3.3\HeuristicLab.Analysis.FitnessLandscape-3.3.csproj">
+      <Project>{5fbdcd4a-3c2a-4ec6-83ce-34b29f43621a}</Project>
+      <Name>HeuristicLab.Analysis.FitnessLandscape-3.3</Name>
+      <Private>False</Private>
+    </ProjectReference>
     <ProjectReference Include="..\..\HeuristicLab.Analysis\3.3\HeuristicLab.Analysis-3.3.csproj">
       <Project>{887425b4-4348-49ed-a457-b7d2c26ddbf9}</Project>

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()));
 

branches/PerformanceComparison/HeuristicLab.Algorithms.MemPR/3.3/Permutation/PermutationMemPR.cs

@@ -534 +534 @@
       var evaluations = 0;
       var child = (Encodings.PermutationEncoding.Permutation)p1.Clone();
-
+      var childF = eval(child, token);
+      evaluations++;
+
+      var thisPath = new List<Tuple<Encodings.PermutationEncoding.Permutation, double>>() {
+        Tuple.Create((Encodings.PermutationEncoding.Permutation)child.Clone(), (childF - Context.LowerBound) / (Context.AverageQuality - Context.LowerBound))
+      };
       best = double.NaN;
       Encodings.PermutationEncoding.Permutation bestChild = null;
@@ -566 +571 @@
           var idx2 = invChild[p2[idx1]];
           Swap(child, idx1, idx2);
+          thisPath.Add(Tuple.Create((Encodings.PermutationEncoding.Permutation)child.Clone(), (bestChange - Context.LowerBound) / (Context.AverageQuality - Context.LowerBound)));
           invChild[child[idx1]] = idx1;
           invChild[child[idx2]] = idx2;
@@ -582 +588 @@
       }
       Context.IncrementEvaluatedSolutions(evaluations);
+      if (thisPath.Count > 5)
+        Context.RelinkedPaths.AddPath(thisPath);
 
       if (VALIDATE && bestChild != null && !bestChild.Validate()) throw new ArgumentException("Relinking produced invalid child");