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

Timestamp:

07/20/13 13:06:59 (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/PermutationInformation.cs (added)
• SolutionsCaching/PermutationSolutionDictionary.cs (modified) (2 diffs)
• SolutionsCaching/SolutionCachingAnalyzer.cs (modified) (6 diffs)
• SolutionsCaching/SolutionDictionary.cs (modified) (1 diff)

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

@@ -119 +119 @@
     <Compile Include="SolutionsCaching\SolutionDictionary.cs" />
     <Compile Include="SelectionPressureAnalyzer.cs" />
+    <Compile Include="SolutionsCaching\PermutationInformation.cs" />
     <Compile Include="WorstQualityAnalyzer.cs" />
     <Compile Include="InitializableOperator.cs" />

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

@@ -31 +31 @@
   [StorableClass]
   public class PermutationSolutionDictionary<TKey, TValue> : SolutionDictionary<TKey, TValue>
-    where TKey : PermutationWrapper {
+    where TKey : PermutationWrapper
+    where TValue : PermutationInformation {
 
     public PermutationSolutionDictionary() {
@@ -83 +84 @@
       return new PermutationSolutionDictionary<TKey, TValue>(this, cloner);
     }
+
+    public int NumberOfPartialSolutions() {
+      return solutionDictionary.Where(x => x.Key.ElementType == ElementType.Diff).Count();
+    }
+
+    public int NumberOfCompleteSolutions() {
+      return solutionDictionary.Where(x => x.Key.ElementType == ElementType.Complete).Count();
+    }
   }
 }

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

@@ -20 +20 @@
 #endregion
 
-
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -35 +34 @@
   public class SolutionCachingAnalyzer : SingleSuccessorOperator, IAnalyzer {
     private const string ResultsParameterName = "Results";
-    //TODO: this should be a stateful item!
+
     #region IAnalyzer Members
     public bool EnabledByDefault {
@@ -58 +57 @@
       get { return ResultsParameter.ActualValue; }
     }
-
-    [Storable]
-    private PermutationSolutionDictionary<PermutationWrapper, int> solDict;
     #endregion
 
@@ -68 +64 @@
     private SolutionCachingAnalyzer(SolutionCachingAnalyzer original, Cloner cloner)
       : base(original, cloner) {
-      this.solDict = (PermutationSolutionDictionary<PermutationWrapper, int>)original.solDict.Clone(cloner);
     }
 
@@ -76 +71 @@
       Parameters.Add(new LookupParameter<IntValue>("Generations", "Nr of generations."));
       Parameters.Add(new ScopeTreeLookupParameter<Permutation>("Solution", "The solutions that should be stored.", "TSPTour", 1));
-      solDict = new PermutationSolutionDictionary<PermutationWrapper, int>();
     }
 
@@ -85 +79 @@
     public override IOperation Apply() {
       ItemArray<Permutation> solutions = SolutionParameter.ActualValue;
+      PermutationSolutionDictionary<PermutationWrapper, PermutationInformation> solDict;
+
+      if (!Results.ContainsKey("SolutionCache")) {
+        solDict = new PermutationSolutionDictionary<PermutationWrapper, PermutationInformation>();
+        Results.Add(new Result("SolutionCache", solDict));
+      } else {
+        solDict = (PermutationSolutionDictionary<PermutationWrapper, PermutationInformation>)Results["SolutionCache"].Value;
+      }
 
       foreach (var sol in solutions) {
-        solDict.Add(new PermutationWrapper(sol), GenerationsParameter.ActualValue.Value);
+        PermutationInformation info = new PermutationInformation();
+        info.Generation = GenerationsParameter.ActualValue.Value;
+        info.ProducedBy = ProducedBy.Mutation;
+        
+        solDict.Add(new PermutationWrapper(sol), info);
       }
-
-      if (!ResultsParameter.ActualValue.ContainsKey("SolutionCache")) {
-        ResultsParameter.ActualValue.Add(new Result("SolutionCache", solDict));
-      }
-
       return base.Apply();
     }

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

@@ -66 +66 @@
       return solutionDictionary.ContainsKey(key);
     }
+
+    public int Size() {
+      return solutionDictionary.Count;
+    }
   }
 }