Changeset 10105 for branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/PermutationEncoding

Timestamp:

11/05/13 10:27:17 (11 years ago)

Author:

ascheibe

Message:

#1886 renamed some properties in SolutionInformation as suggested by swagner

Location:

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/PermutationEncoding

Files:

• PermutationSolutionCacheCollector.cs (modified) (1 diff)
• PermutationSolutionInformation.cs (modified) (1 diff)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/PermutationEncoding/PermutationSolutionCacheCollector.cs

@@ -90 +90 @@
       foreach (var sol in solutions) {
         PermutationSolutionInformation info = new PermutationSolutionInformation();
-        info.Generation = GenerationsParameter.ActualValue.Value;
+        info.Iteration = GenerationsParameter.ActualValue.Value;
         info.ProducedBy = ProducedBy.CrossoverAndMutation;
 

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/PermutationEncoding/PermutationSolutionInformation.cs

@@ -47 +47 @@
 
       h = (h << 4) ^ (h >> 28) ^ ProducedBy.GetHashCode();
-      h = (h << 4) ^ (h >> 28) ^ Generation.GetHashCode();
+      h = (h << 4) ^ (h >> 28) ^ Iteration.GetHashCode();
 
-      if (ParentList != null) {
-        foreach (var parent in ParentList) {
+      if (Predecessors != null) {
+        foreach (var parent in Predecessors) {
           h = (h << 4) ^ (h >> 28) ^ pweq.GetHashCode(parent);
         }