Changeset 9723 for branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers

Timestamp:

07/18/13 15:45:03 (11 years ago)

Author:

ascheibe

Message:

#1886 worked on solution caching

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3

Files:

• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj (modified) (1 diff)
• SolutionsCaching/PermutationSolutionDictionary.cs (modified) (4 diffs)
• SolutionsCaching/PermutationWrapper.cs (modified) (4 diffs)
• SolutionsCaching/PermutationWrapperEqualityComparer.cs (added)
• SolutionsCaching/SolutionCachingAnalyzer.cs (added)
• SolutionsCaching/SolutionDictionary.cs (modified) (2 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj

@@ -113 +113 @@
     <Compile Include="CombinedOperators\QAPAfterMutationCombinedOperator.cs" />
     <Compile Include="CombinedOperators\QAPAfterCrossoverCombinedOperator.cs" />
+    <Compile Include="SolutionsCaching\SolutionCachingAnalyzer.cs" />
     <Compile Include="SolutionsCaching\PermutationSolutionDictionary.cs" />
     <Compile Include="SolutionsCaching\PermutationWrapper.cs" />
+    <Compile Include="SolutionsCaching\PermutationWrapperEqualityComparer.cs" />
     <Compile Include="SolutionsCaching\SolutionDictionary.cs" />
     <Compile Include="SelectionPressureAnalyzer.cs" />

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/SolutionsCaching/PermutationSolutionDictionary.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using System.Linq;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Encodings.PermutationEncoding;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Analysis.AlgorithmBehavior.Analyzers {
+  [Item("PermutationSolutionDictionary", "Stores permutations generated by an algorithm.")]
+  [StorableClass]
   public class PermutationSolutionDictionary<TKey, TValue> : SolutionDictionary<TKey, TValue>
     where TKey : PermutationWrapper {
 
     public PermutationSolutionDictionary() {
-      solutionDictionary = new Dictionary<TKey, List<TValue>>();
+      solutionDictionary = new Dictionary<TKey, List<TValue>>(new PermutationWrapperEqualityComparer());
+    }
+
+    [StorableConstructor]
+    protected PermutationSolutionDictionary(bool deserializing) : base(deserializing) { }
+    protected PermutationSolutionDictionary(PermutationSolutionDictionary<TKey, TValue> original, Cloner cloner)
+      : base(original, cloner) {
     }
 
@@ -51 +62 @@
         Permutation pr = p.GetPermutation();
         int diffs = CountDiffs(permutation, pr);
-        if (min < diffs) {
+        if (diffs < min) {
           result = pr;
           min = diffs;
@@ -62 +73 @@
     private int CountDiffs(Permutation x, Permutation y) {
       int result = 0;
+      // yes we ignore path encoding at the moment
       for (int i = 0; i < x.Length; i++) {
         if (x[i] != y[i]) result++;
@@ -67 +79 @@
       return result;
     }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new PermutationSolutionDictionary<TKey, TValue>(this, cloner);
+    }
   }
 }

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/SolutionsCaching/PermutationWrapper.cs

@@ -22 +22 @@
 using System.Collections.Generic;
 using HeuristicLab.Common;
+using HeuristicLab.Core;
 using HeuristicLab.Encodings.PermutationEncoding;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
 namespace HeuristicLab.Analysis.AlgorithmBehavior.Analyzers {
   public enum ElementType { Complete, Diff };
 
-  public class PermutationWrapper {
+  [Item("PermutationWrapper", "Wrapper for permutations. Can either store a permutation or a diff.")]
+  [StorableClass]
+  public class PermutationWrapper : Item {
+    [Storable]
     public ElementType ElementType { get; set; }
+    [Storable]
     public Permutation Permutation { get; set; }
+    [Storable]
     public List<int> Diffs { get; set; }
 
@@ -36 +43 @@
       Diffs = new List<int>();
       Permutation = p;
+    }
+
+    public PermutationWrapper() {
+      ElementType = ElementType.Complete;
+      Diffs = new List<int>();
+    }
+
+    [StorableConstructor]
+    protected PermutationWrapper(bool deserializing) : base(deserializing) { }
+    protected PermutationWrapper(PermutationWrapper original, Cloner cloner)
+      : base(original, cloner) {
+      this.ElementType = original.ElementType;
+      this.Diffs = new List<int>(original.Diffs);
+      this.Permutation = (Permutation)original.Permutation.Clone(cloner);
     }
 
@@ -52 +73 @@
     }
 
+    //supports efficient diffs up to a permutation length of 30000
     public void StorePartialPermutation(Permutation original, Permutation newPermutation) {
       ElementType = ElementType.Diff;
@@ -70 +92 @@
       Permutation = original;
     }
+
+    public override IDeepCloneable Clone(Cloner cloner) {
+      return new PermutationWrapper(this, cloner);
+    }
   }
 }

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/SolutionsCaching/SolutionDictionary.cs

@@ -21 +21 @@
 
 using System.Collections.Generic;
+using HeuristicLab.Common;
+using HeuristicLab.Core;
+using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.PluginInfrastructure;
 
 namespace HeuristicLab.Analysis.AlgorithmBehavior.Analyzers {
-  public abstract class SolutionDictionary<TKey, TValue> {
+  [Item("SolutionDictionary", "Stores solutions generated by an algorithm.")]
+  [StorableClass]
+  [NonDiscoverableType]
+  public abstract class SolutionDictionary<TKey, TValue> : Item {
+    [Storable]
     protected Dictionary<TKey, List<TValue>> solutionDictionary;
 
     public SolutionDictionary() {
       solutionDictionary = new Dictionary<TKey, List<TValue>>();
+    }
+
+    [StorableConstructor]
+    protected SolutionDictionary(bool deserializing) : base(deserializing) { }
+    protected SolutionDictionary(SolutionDictionary<TKey, TValue> original, Cloner cloner)
+      : base(original, cloner) {
+      this.solutionDictionary = new Dictionary<TKey, List<TValue>>(original.solutionDictionary);
     }
 
@@ -39 +54 @@
 
       if (ContainsKey(key)) {
-        solutionDictionary[key].Add(value);
+        if (!solutionDictionary[key].Contains(value))
+          solutionDictionary[key].Add(value);
       } else {
         InsertKeyValue(key, value);