Changeset 11667 for branches/Parameter-less Population Pyramid

Timestamp:

12/06/14 16:58:02 (10 years ago)

Author:

bgoldman

Message:

#2282 Major bug fixes, now gets answers close to correct.

Location:

branches/Parameter-less Population Pyramid

Files:

• HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/EnumerableBoolEqualityComparer.cs (added)
• HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3.csproj (modified) (2 diffs)
• HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/LinkageCrossover.cs (modified) (1 diff)
• HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/LinkageTree.cs (modified) (2 diffs)
• HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/ParameterlessPopulationPyramid.cs (modified) (9 diffs)
• HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/Plugin.cs.frame (modified) (1 diff)
• ParameterlessPopulationPyramid.Test/EnumerableBoolEqualityComparerTest.cs (added)
• ParameterlessPopulationPyramid.Test/ParameterlessPopulationPyramid.Test.csproj (modified) (1 diff)

branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3.csproj

@@ -104 +104 @@
   <ItemGroup>
     <Compile Include="AlgorithmBase.cs" />
+    <Compile Include="EnumerableBoolEqualityComparer.cs" />
     <Compile Include="LinkageCrossover.cs" />
+    <Compile Include="Plugin.cs" />
     <Compile Include="Problems\DeceptiveTrapProblem.cs" />
     <Compile Include="HillClimber.cs" />
@@ -111 +113 @@
     <Compile Include="Population.cs" />
     <Compile Include="Problems\BinaryVectorProblem.cs" />
-    <Compile Include="Plugin.cs" />
     <Compile Include="Problems\EvaluationTracker.cs" />
     <Compile Include="Problems\HIFFProblem.cs" />

branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/LinkageCrossover.cs

@@ -57 +57 @@
       if (changed) {
         double newFitness = problem.Evaluate(solution);
-        if (problem.IsBetter(newFitness, fitness)) {
-          // improvement made, keep change to solution
-          fitness = newFitness;
-        } else {
-          // revert solution
+        // if the original is strictly better, revert the change
+        if (problem.IsBetter(fitness, newFitness)) {
           foreach (var index in flipped) {
             solution[index] = !solution[index];
           }
+        } else {
+          // new solution is no worse than original, keep change to solution
+          fitness = newFitness;
         }
       }

branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/LinkageTree.cs

@@ -52 +52 @@
         // Swap element "i" with a random earlier element (including itself)
         int swapIndex = random.Next(i + 1);
-        yield return source[swapIndex];
-        source[swapIndex] = source[i];
-        // we don't actually perform the swap, we can forget about the
-        // swapped element because we already returned it.
+        source.Swap(i, swapIndex);
+        yield return source[i];
       }
       yield return source[0];
@@ -148 +146 @@
       var topLevel = Enumerable.Range(0, length).ToList();
       bool[] useful = Enumerable.Repeat(true, clusters.Length).ToArray();
-
 
       // Store the distances between all clusters

branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/ParameterlessPopulationPyramid.cs

@@ -39 +39 @@
   [StorableClass]
   [Creatable("Parameterless Population Pyramid")]
-  
+
   public class ParameterlessPopulationPyramid : AlgorithmBase {
     private readonly IRandom random = new MersenneTwister();
@@ -46 +46 @@
 
     // Tracks all solutions in Pyramid for quick membership checks
-    private readonly HashSet<bool[]> seen = new HashSet<bool[]>();
+    private HashSet<bool[]> seen = new HashSet<bool[]>(new EnumerableBoolEqualityComparer());
 
     private const string MaximumIterationsParameterName = "Maximum Iterations";
@@ -53 +53 @@
       get { return (IFixedValueParameter<IntValue>)Parameters[MaximumIterationsParameterName]; }
     }
-    
+
     public int MaximumIterations {
       get { return MaximumIterationsParameter.Value.Value; }
@@ -70 +70 @@
     }
 
-    
+
     private const string SeedParameterName = "Seed";
 
@@ -149 +149 @@
     }
 
-
     private void AddIfUnique(bool[] solution, int level) {
       // Don't add things you have seen
@@ -156 +155 @@
         pyramid.Add(new Population(tracker.Length, random));
       }
-      pyramid[level].Add(solution);
-      seen.Add(solution);
+      var copied = (bool[])solution.Clone();
+      pyramid[level].Add(copied);
+      seen.Add(copied);
     }
 
@@ -169 +169 @@
       fitness = HillClimber.ImproveToLocalOptimum(tracker, solution, fitness, random);
       AddIfUnique(solution, 0);
+
       for (int level = 0; level < pyramid.Count; level++) {
         var current = pyramid[level];
@@ -184 +185 @@
       if (SetSeedRandomly) Seed = new System.Random().Next();
       pyramid = new List<Population>();
+      seen.Clear();
       random.Reset(Seed);
       tracker = new EvaluationTracker(Problem, MaximumEvaluations);
@@ -213 +215 @@
           ResultsQualitiesBest.Values.Add(tracker.BestQuality);
           ResultsQualitiesIteration.Values.Add(fitness);
-        }        
+        }
       }
     }

branches/Parameter-less Population Pyramid/HeuristicLab.Algorithms.ParameterlessPopulationPyramid/3.3/Plugin.cs.frame

@@ -31 +31 @@
   [Plugin("HeuristicLab.Algorithms.ParameterlessPopulationPyramid", "3.3.10.$WCREV$")]
   [PluginFile("HeuristicLab.Algorithms.ParameterlessPopulationPyramid-3.3.dll", PluginFileType.Assembly)]
+  [PluginDependency("HeuristicLab.Analysis", "3.3")]
   [PluginDependency("HeuristicLab.Collections", "3.3")]
   [PluginDependency("HeuristicLab.Common", "3.3")]
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
+  [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Data", "3.3")]
+  [PluginDependency("HeuristicLab.Encodings.BinaryVectorEncoding", "3.3")]
+  [PluginDependency("HeuristicLab.Optimization", "3.3")]
+  [PluginDependency("HeuristicLab.Parameters", "3.3")]
   [PluginDependency("HeuristicLab.Persistence", "3.3")]
+  [PluginDependency("HeuristicLab.Random", "3.3")]
   public class Plugin : PluginBase {
   }

branches/Parameter-less Population Pyramid/ParameterlessPopulationPyramid.Test/ParameterlessPopulationPyramid.Test.csproj

@@ -63 +63 @@
   </Choose>
   <ItemGroup>
+    <Compile Include="EnumerableBoolEqualityComparerTest.cs" />
     <Compile Include="LinkageTreeTest.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />