Changeset 9757

Timestamp:

07/25/13 16:28:49 (11 years ago)

Author:

ascheibe

Message:

#1886 fixed a bug and improved PermutationInformation

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior

Files:

• AlgorithmBehaviorUnitTests/UnitTest2.cs (modified) (2 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/SolutionsCaching/AfterCrossoverSolutionCachingAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/SolutionsCaching/PermutationInformation.cs (modified) (3 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/SolutionsCaching/PermutationSolutionDictionary.cs (modified) (4 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/SolutionsCaching/SolutionCachingAnalyzer.cs (modified) (1 diff)

branches/HeuristicLab.Analysis.AlgorithmBehavior/AlgorithmBehaviorUnitTests/UnitTest2.cs

@@ -35 +35 @@
             break;
           }
-
         }
       }
@@ -45 +44 @@
             break;
           }
-
         }
       }

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

@@ -96 +96 @@
       info.ParentList.Add(p1Pw);
       info.ParentList.Add(p2Pw);
-      solDict.Add(new PermutationWrapper(solution), info);
+      solDict.Add(new PermutationWrapper((Permutation)solution.Clone(new Cloner())), info);
 
       return base.Apply();

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

@@ -37 +37 @@
     [Storable]
     public int Generation { get; set; }
+    [Storable]
+    PermutationWrapperEqualityComparer pweq;
 
-    public PermutationInformation() { }
+    public PermutationInformation() {
+      pweq = new PermutationWrapperEqualityComparer();
+    }
 
     [StorableConstructor]
@@ -47 +51 @@
       this.ParentList = new List<PermutationWrapper>(original.ParentList);
       this.Generation = original.Generation;
+      this.pweq = new PermutationWrapperEqualityComparer();
     }
 
@@ -52 +57 @@
       return new PermutationInformation(this, cloner);
     }
+
+    public override int GetHashCode() {
+      //use rotating hash, should be enough
+      //see: http://eternallyconfuzzled.com/tuts/algorithms/jsw_tut_hashing.aspx
+      int h = 0;
+
+      h = (h << 4) ^ (h >> 28) ^ ProducedBy.GetHashCode();
+      h = (h << 4) ^ (h >> 28) ^ Generation.GetHashCode();
+
+      if (ParentList != null) {
+        foreach (var parent in ParentList) {
+          h = (h << 4) ^ (h >> 28) ^ pweq.GetHashCode(parent);
+        }
+      }
+
+      return h;
+    }
+
+    public override bool Equals(object obj) {
+      PermutationInformation pi = obj as PermutationInformation;
+
+      if (ProducedBy == pi.ProducedBy && Generation == pi.Generation) {
+        if (pi.ParentList == null && ParentList == null) return true;
+        if (pi.ParentList != null && ParentList == null ||
+          pi.ParentList == null && ParentList != null) return false;
+        if (pi.ParentList.Count != ParentList.Count) return false;
+
+        foreach (var p in ParentList) {
+          if (!pi.ParentList.Contains(p)) return false;
+        }
+        return true;
+      } else {
+        return false;
+      }
+    }
   }
 }

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

@@ -20 +20 @@
 #endregion
 
-using System;
 using System.Collections.Generic;
 using System.Linq;
@@ -34 +33 @@
     [Storable]
     protected Dictionary<PermutationWrapper, List<PermutationInformation>> solutionDictionary;
-    public Dictionary<PermutationWrapper, List<PermutationInformation>> SolutionDictionary { get { return solutionDictionary; } }
+
+    public Dictionary<PermutationWrapper, List<PermutationInformation>> SolutionDictionary {
+      get { return solutionDictionary; }
+    }
+
+    [Storable]
+    PermutationEqualityComparer peq;
 
     public PermutationSolutionDictionary() {
       solutionDictionary = new Dictionary<PermutationWrapper, List<PermutationInformation>>(new PermutationWrapperEqualityComparer());
+      peq = new PermutationEqualityComparer();
     }
 
@@ -45 +51 @@
       : base(original, cloner) {
       this.solutionDictionary = new Dictionary<PermutationWrapper, List<PermutationInformation>>(original.solutionDictionary, new PermutationWrapperEqualityComparer());
+      this.peq = new PermutationEqualityComparer();
     }
 
@@ -105 +112 @@
 
     public PermutationWrapper GetPermutationWrapperOfPermutation(Permutation permutation) {
-      PermutationEqualityComparer peq = new PermutationEqualityComparer();
-      var res = solutionDictionary.Where(x => peq.GetHashCode(x.Key.GetPermutation()) == peq.GetHashCode(permutation));
-
-      //TODO: fix this
-      if (res.Count() > 1) {
-        throw new Exception("ERROR: Cannot conatin duplicates!");
-      }
-
-      return res.First().Key;
+      return solutionDictionary.Single(x => peq.GetHashCode(x.Key.GetPermutation()) == peq.GetHashCode(permutation)).Key;
     }
 

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

@@ -93 +93 @@
         info.ProducedBy = ProducedBy.Mutation;
         
-        solDict.Add(new PermutationWrapper(sol), info);
+        solDict.Add(new PermutationWrapper((Permutation)sol.Clone(new Cloner())), info);
       }
       return base.Apply();