Changeset 14563 for branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/LinearLinkage/LinearLinkageMemPR.cs

Timestamp:

01/13/17 18:18:37 (7 years ago)

Author:

abeham

Message:

#2701:

• Tagged unbiased models with property
• Changed default configuration
• Added solution distance to breeding, relinking and delinking performance models
• Changed sampling model to base prediction on average distance in genotype space
• Changed target for hillclimber and relinking to relative (quality improvement)
• changed breeding to count cache hits per crossover

File:

• branches/MemPRAlgorithm/HeuristicLab.Algorithms.MemPR/3.3/LinearLinkage/LinearLinkageMemPR.cs (modified) (4 diffs)

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

@@ -32 +32 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Algorithms.MemPR.Grouping {
@@ -44 +45 @@
       foreach (var trainer in ApplicationManager.Manager.GetInstances<ISolutionModelTrainer<LinearLinkageMemPRPopulationContext>>())
         SolutionModelTrainerParameter.ValidValues.Add(trainer);
-      
+
+      if (SolutionModelTrainerParameter.ValidValues.Count > 0) {
+        var unbiased = SolutionModelTrainerParameter.ValidValues.FirstOrDefault(x => !x.Bias);
+        if (unbiased != null) SolutionModelTrainerParameter.Value = unbiased;
+      }
+
       foreach (var localSearch in ApplicationManager.Manager.GetInstances<ILocalSearch<LinearLinkageMemPRSolutionContext>>()) {
         LocalSearchParameter.ValidValues.Add(localSearch);
@@ -245 +251 @@
       cache.Add(p2.Solution);
 
-      var cachehits = 0;
+      var cacheHits = new Dictionary<int, int>() { { 0, 0 }, { 1, 0 } };
       var evaluations = 0;
       var probe = Context.ToScope((LinearLinkage)p1.Solution.Clone());
@@ -251 +257 @@
       while (evaluations < p1.Solution.Length) {
         LinearLinkage c = null;
-        if (Context.Random.NextDouble() < 0.8)
-          c = GroupCrossover.Apply(Context.Random, p1.Solution, p2.Solution);
-        else c = SinglePointCrossover.Apply(Context.Random, p1.Solution, p2.Solution);
-        
+        var xochoice = cacheHits.SampleRandom(Context.Random).Key;
+        switch (xochoice) {
+          case 0: c = GroupCrossover.Apply(Context.Random, p1.Solution, p2.Solution); break;
+          case 1: c = SinglePointCrossover.Apply(Context.Random, p1.Solution, p2.Solution); break;
+        }
         if (cache.Contains(c)) {
-          cachehits++;
-          if (cachehits > 10) break;
+          cacheHits[xochoice]++;
+          if (cacheHits[xochoice] > 10) {
+            cacheHits.Remove(xochoice);
+            if (cacheHits.Count == 0) break;
+          }
           continue;
         }