Changeset 9754 for branches/HeuristicLab.Analysis.AlgorithmBehavior

Timestamp:

07/25/13 11:14:56 (11 years ago)

Author:

ascheibe

Message:

#1886 added a caching analyzer for crossover

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior

Files:

• AlgorithmBehaviorUnitTests/AlgorithmBehaviorUnitTests.csproj (modified) (1 diff)
• AlgorithmBehaviorUnitTests/UnitTest2.cs (added)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/ConvexHullView.cs (modified) (2 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/PermutationSolutionDictionaryView.cs (modified) (3 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers-3.3.csproj (modified) (1 diff)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/SolutionsCaching/AfterCrossoverSolutionCachingAnalyzer.cs (added)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/SolutionsCaching/PermutationSolutionDictionary.cs (modified) (5 diffs)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/SolutionsCaching/SolutionCachingAnalyzer.cs (modified) (1 diff)
• HeuristicLab.Analysis.AlgorithmBehavior.Analyzers/3.3/SolutionsCaching/SolutionDictionary.cs (modified) (3 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/AlgorithmBehaviorUnitTests/AlgorithmBehaviorUnitTests.csproj

@@ -72 +72 @@
   </Choose>
   <ItemGroup>
+    <Compile Include="UnitTest2.cs" />
     <Compile Include="UnitTest1.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/ConvexHullView.cs

@@ -30 +30 @@
 namespace HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views {
   [View("ConvexHull View")]
-  [Content(typeof(PermutationSolutionDictionary<PermutationWrapper, PermutationInformation>), false)]
+  [Content(typeof(PermutationSolutionDictionary), false)]
   public partial class ConvexHullView : ItemView {
     public ConvexHullView() {
@@ -36 +36 @@
     }
 
-    public new PermutationSolutionDictionary<PermutationWrapper, PermutationInformation> Content {
-      get { return (PermutationSolutionDictionary<PermutationWrapper, PermutationInformation>)base.Content; }
+    public new PermutationSolutionDictionary Content {
+      get { return (PermutationSolutionDictionary)base.Content; }
       set { base.Content = value; }
     }

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views/3.3/PermutationSolutionDictionaryView.cs

@@ -29 +29 @@
 namespace HeuristicLab.Analysis.AlgorithmBehavior.Analyzers.Views {
   [View("PermutationSolutionDictionary View")]
-  [Content(typeof(PermutationSolutionDictionary<PermutationWrapper, PermutationInformation>), true)]
+  [Content(typeof(PermutationSolutionDictionary), true)]
   public partial class PermutationSolutionDictionaryView : ItemView {
     public PermutationSolutionDictionaryView() {
@@ -35 +35 @@
     }
 
-    public new PermutationSolutionDictionary<PermutationWrapper, PermutationInformation> Content {
-      get { return (PermutationSolutionDictionary<PermutationWrapper, PermutationInformation>)base.Content; }
+    public new PermutationSolutionDictionary Content {
+      get { return (PermutationSolutionDictionary)base.Content; }
       set { base.Content = value; }
     }
@@ -55 +55 @@
     protected override void OnInitialized(EventArgs e) {
       base.OnInitialized(e);
-      var viewTypes = MainFormManager.GetViewTypes(typeof(PermutationSolutionDictionary<PermutationWrapper, PermutationInformation>), true);
+      var viewTypes = MainFormManager.GetViewTypes(typeof(PermutationSolutionDictionary), true);
       foreach (Type viewType in viewTypes.OrderBy(x => ViewAttribute.GetViewName(x))) {
         if ((viewType != typeof(PermutationSolutionDictionaryView)) && (viewType != typeof(ViewHost))) {

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\AfterCrossoverSolutionCachingAnalyzer.cs" />
     <Compile Include="SolutionsCaching\SolutionCachingAnalyzer.cs" />
     <Compile Include="SolutionsCaching\PermutationSolutionDictionary.cs" />

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;
@@ -30 +31 @@
   [Item("PermutationSolutionDictionary", "Stores permutations generated by an algorithm.")]
   [StorableClass]
-  public class PermutationSolutionDictionary<TKey, TValue> : SolutionDictionary<TKey, TValue>
-    where TKey : PermutationWrapper
-    where TValue : PermutationInformation {
+  public class PermutationSolutionDictionary : SolutionDictionary<PermutationWrapper, PermutationInformation> {
+    [Storable]
+    protected Dictionary<PermutationWrapper, List<PermutationInformation>> solutionDictionary;
+    public Dictionary<PermutationWrapper, List<PermutationInformation>> SolutionDictionary { get { return solutionDictionary; } }
 
     public PermutationSolutionDictionary() {
-      solutionDictionary = new Dictionary<TKey, List<TValue>>(new PermutationWrapperEqualityComparer());
+      solutionDictionary = new Dictionary<PermutationWrapper, List<PermutationInformation>>(new PermutationWrapperEqualityComparer());
     }
 
     [StorableConstructor]
     protected PermutationSolutionDictionary(bool deserializing) : base(deserializing) { }
-    protected PermutationSolutionDictionary(PermutationSolutionDictionary<TKey, TValue> original, Cloner cloner)
+    protected PermutationSolutionDictionary(PermutationSolutionDictionary original, Cloner cloner)
       : base(original, cloner) {
+      this.solutionDictionary = new Dictionary<PermutationWrapper, List<PermutationInformation>>(original.solutionDictionary, new PermutationWrapperEqualityComparer());
     }
 
-    protected override void InsertKeyValue(TKey key, TValue value) {
+    public override int Size() {
+      return solutionDictionary.Count;
+    }
+
+    public override void Add(PermutationWrapper key, PermutationInformation value) {
+      if (solutionDictionary.Count == 0) {
+        var lst = new List<PermutationInformation>();
+        lst.Add(value);
+        solutionDictionary.Add(key, lst);
+        return;
+      }
+
+      if (ContainsKey(key)) {
+        if (!solutionDictionary[key].Contains(value))
+          solutionDictionary[key].Add(value);
+      } else {
+        InsertKeyValue(key, value);
+      }
+    }
+
+    protected override void InsertKeyValue(PermutationWrapper key, PermutationInformation value) {
       int diffCnt;
       Permutation p = key.GetPermutation();
@@ -53 +76 @@
       }
 
-      var lst = new List<TValue>();
+      var lst = new List<PermutationInformation>();
       lst.Add(value);
       solutionDictionary.Add(key, lst);
@@ -81 +104 @@
     }
 
+    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;
+    }
+
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new PermutationSolutionDictionary<TKey, TValue>(this, cloner);
+      return new PermutationSolutionDictionary(this, cloner);
     }
 
@@ -96 +131 @@
       return solutionDictionary.Where(x => x.Value.Where(y => y.Generation == generation).Count() != 0).Select(x => x.Key).ToList<PermutationWrapper>();
     }
+
+    public override bool ContainsKey(PermutationWrapper key) {
+      return solutionDictionary.ContainsKey(key);
+    }
   }
 }

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

@@ -79 +79 @@
     public override IOperation Apply() {
       ItemArray<Permutation> solutions = SolutionParameter.ActualValue;
-      PermutationSolutionDictionary<PermutationWrapper, PermutationInformation> solDict;
+      PermutationSolutionDictionary solDict;
 
       if (!Results.ContainsKey("SolutionCache")) {
-        solDict = new PermutationSolutionDictionary<PermutationWrapper, PermutationInformation>();
+        solDict = new PermutationSolutionDictionary();
         Results.Add(new Result("SolutionCache", solDict));
       } else {
-        solDict = (PermutationSolutionDictionary<PermutationWrapper, PermutationInformation>)Results["SolutionCache"].Value;
+        solDict = (PermutationSolutionDictionary)Results["SolutionCache"].Value;
       }
 

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

@@ -20 +20 @@
 #endregion
 
-using System.Collections.Generic;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -31 +30 @@
   [NonDiscoverableType]
   public abstract class SolutionDictionary<TKey, TValue> : Item {
-    [Storable]
-    protected Dictionary<TKey, List<TValue>> solutionDictionary;
 
-    public SolutionDictionary() {
-      solutionDictionary = new Dictionary<TKey, List<TValue>>();
-    }
+    public SolutionDictionary() { }
 
     [StorableConstructor]
@@ -42 +37 @@
     protected SolutionDictionary(SolutionDictionary<TKey, TValue> original, Cloner cloner)
       : base(original, cloner) {
-      this.solutionDictionary = new Dictionary<TKey, List<TValue>>(original.solutionDictionary);
     }
 
-    public void Add(TKey key, TValue value) {
-      if (solutionDictionary.Count == 0) {
-        var lst = new List<TValue>();
-        lst.Add(value);
-        solutionDictionary.Add(key, lst);
-        return;
-      }
-
-      if (ContainsKey(key)) {
-        if (!solutionDictionary[key].Contains(value))
-          solutionDictionary[key].Add(value);
-      } else {
-        InsertKeyValue(key, value);
-      }
-    }
+    public abstract void Add(TKey key, TValue value);
 
     protected abstract void InsertKeyValue(TKey key, TValue value);
 
-    public virtual bool ContainsKey(TKey key) {
-      return solutionDictionary.ContainsKey(key);
-    }
+    public abstract bool ContainsKey(TKey key);
 
-    public int Size() {
-      return solutionDictionary.Count;
-    }
+    public abstract int Size();
   }
 }