Changeset 10105 for branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/SolutionInformation.cs

Timestamp:

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

Author:

ascheibe

Message:

#1886 renamed some properties in SolutionInformation as suggested by swagner

File:

• branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/SolutionInformation.cs (modified) (4 diffs)

branches/HeuristicLab.Analysis.AlgorithmBehavior/HeuristicLab.Analysis.SolutionCaching/3.3/SolutionInformation.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Analysis.SolutionCaching {
-  public enum ProducedBy { Crossover, Mutation, CrossoverAndMutation, Move, Other };
+  public enum ProducedBy { Other = 0, Crossover = 1, Mutation = 2, CrossoverAndMutation = 3, Move = 4 };
 
   [Item("SolutionInformation", "Stores meta-information about a solution.")]
@@ -35 +35 @@
     public ProducedBy ProducedBy { get; set; }
     [Storable]
-    public List<T> ParentList { get; set; }
+    public List<T> Predecessors { get; set; }
     [Storable]
-    public int Generation { get; set; }
+    public int Iteration { get; set; }
     [Storable]
     public ResultCollection InfoStore { get; set; }
 
     public SolutionInformation() {
-      ParentList = new List<T>();
+      Predecessors = new List<T>();
       InfoStore = new ResultCollection();
     }
@@ -51 +51 @@
       : base(original, cloner) {
       this.ProducedBy = original.ProducedBy;
-      this.ParentList = new List<T>(original.ParentList);
-      this.Generation = original.Generation;
+      this.Predecessors = new List<T>(original.Predecessors);
+      this.Iteration = original.Iteration;
       this.InfoStore = (ResultCollection)original.InfoStore.Clone(cloner);
     }
@@ -64 +64 @@
       if (pi == null) return false;
 
-      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;
+      if (ProducedBy == pi.ProducedBy && Iteration == pi.Iteration) {
+        if (pi.Predecessors == null && Predecessors == null) return true;
+        if (pi.Predecessors != null && Predecessors == null ||
+          pi.Predecessors == null && Predecessors != null) return false;
+        if (pi.Predecessors.Count != Predecessors.Count) return false;
 
-        foreach (var p in ParentList) {
-          if (!pi.ParentList.Contains(p)) return false;
+        foreach (var p in Predecessors) {
+          if (!pi.Predecessors.Contains(p)) return false;
         }
         foreach (IResult info in InfoStore) {