Changeset 4098 for trunk/sources/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs

Timestamp:

07/25/10 01:04:14 (14 years ago)

Author:

abeham

Message:

#1090

• Fixed initialization of operators and made operator list storable

File:

• trunk/sources/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Problems.Knapsack/3.3/KnapsackProblem.cs

@@ -126 +126 @@
       set { BestKnownSolutionParameter.Value = value; }
     }
-    private List<IOperator> operators;
     public IEnumerable<IOperator> Operators {
       get { return operators.Cast<IOperator>(); }
@@ -135 +134 @@
     #endregion
 
-    private void InitializeRandomKnapsackInstance() {
-      System.Random rand = new System.Random();
-
-      int itemCount = rand.Next(10, 100);
-      Weights = new IntArray(itemCount);
-      Values = new IntArray(itemCount);
-
-      double totalWeight = 0;
-
-      for (int i = 0; i < itemCount; i++ ) {
-        int value = rand.Next(1, 10);
-        int weight = rand.Next(1, 10);
-
-        Values[i] = value;
-        Weights[i] = weight;
-        totalWeight += weight;
-      }
-
-      int capacity = (int)Math.Round(0.7 * totalWeight);
-      KnapsackCapacity = new IntValue(capacity);
-    }
-
+    [Storable]
+    private List<IOperator> operators;
+
+    [StorableConstructor]
+    private KnapsackProblem(bool deserializing) : base() { }
     public KnapsackProblem()
       : base() {
@@ -179 +161 @@
       ParameterizeEvaluator();
 
-      Initialize();
-    }
-
-    [StorableConstructor]
-    private KnapsackProblem(bool deserializing) : base() { }
+      InitializeOperators();
+      AttachEventHandlers();
+    }
 
     public override IDeepCloneable Clone(Cloner cloner) {
       KnapsackProblem clone = (KnapsackProblem)base.Clone(cloner);
-      clone.Initialize();
+      clone.operators = operators.Select(x => (IOperator)cloner.Clone(x)).ToList();
+      clone.AttachEventHandlers();
       return clone;
     }
@@ -274 +255 @@
     #region Helpers
     [StorableHook(HookType.AfterDeserialization)]
-    private void Initialize() {
-      InitializeOperators();
+    private void AttachEventHandlers() {
+      // Start BackwardsCompatibility3.3 (remove with 3.4)
+      if (operators == null) InitializeOperators();
+      // End BackwardsCompatibility3.3
       SolutionCreatorParameter.ValueChanged += new EventHandler(SolutionCreatorParameter_ValueChanged);
       SolutionCreator.BinaryVectorParameter.ActualNameChanged += new EventHandler(SolutionCreator_BinaryVectorParameter_ActualNameChanged);
@@ -350 +333 @@
     }
     #endregion
+
+    private void InitializeRandomKnapsackInstance() {
+      System.Random rand = new System.Random();
+
+      int itemCount = rand.Next(10, 100);
+      Weights = new IntArray(itemCount);
+      Values = new IntArray(itemCount);
+
+      double totalWeight = 0;
+
+      for (int i = 0; i < itemCount; i++) {
+        int value = rand.Next(1, 10);
+        int weight = rand.Next(1, 10);
+
+        Values[i] = value;
+        Weights[i] = weight;
+        totalWeight += weight;
+      }
+
+      int capacity = (int)Math.Round(0.7 * totalWeight);
+      KnapsackCapacity = new IntValue(capacity);
+    }
   }
 }