Changeset 3109 for trunk/sources/HeuristicLab.Problems.Knapsack/3.3/Knapsack.cs

Timestamp:

03/19/10 10:46:02 (14 years ago)

Author:

svonolfe

Message:

Implemented review comments (#917)

File:

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

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

@@ -52 +52 @@
       get { return (ValueParameter<IntValue>)Parameters["KnapsackCapacity"]; }
     }
+    public ValueParameter<IntArray> WeightsParameter {
+      get { return (ValueParameter<IntArray>)Parameters["Weights"]; }
+    }
+    public ValueParameter<IntArray> ValuesParameter {
+      get { return (ValueParameter<IntArray>)Parameters["Values"]; }
+    }
     public ValueParameter<DoubleValue> PenaltyParameter {
       get { return (ValueParameter<DoubleValue>)Parameters["Penalty"]; }
     }
-    public ValueParameter<IntArray> WeightsParameter {
-      get { return (ValueParameter<IntArray>)Parameters["Weights"]; }
-    }
-    public ValueParameter<IntArray> ValuesParameter {
-      get { return (ValueParameter<IntArray>)Parameters["Values"]; }
-    }
     public ValueParameter<IBinaryVectorCreator> SolutionCreatorParameter {
       get { return (ValueParameter<IBinaryVectorCreator>)Parameters["SolutionCreator"]; }
@@ -85 +85 @@
 
     #region Properties
+    public IntValue KnapsackCapacity {
+      get { return KnapsackCapacityParameter.Value; }
+      set { KnapsackCapacityParameter.Value = value; }
+    }
+    public IntArray Weights {
+      get { return WeightsParameter.Value; }
+      set { WeightsParameter.Value = value; }
+    }
+    public IntArray Values {
+      get { return ValuesParameter.Value; }
+      set { ValuesParameter.Value = value; }
+    }
+    public DoubleValue Penalty {
+      get { return PenaltyParameter.Value; }
+      set { PenaltyParameter.Value = value; }
+    }
     public IBinaryVectorCreator SolutionCreator {
       get { return SolutionCreatorParameter.Value; }
@@ -123 +139 @@
       Parameters.Add(new ValueParameter<IntValue>("KnapsackCapacity", "Capacity of the Knapsack.", new IntValue(0)));
       Parameters.Add(new ValueParameter<IntArray>("Weights", "The weights of the items.", new IntArray(5)));
-      WeightsParameter.ActualValue.ToStringChanged += new EventHandler(WeightsActualValue_ToStringChanged);
       Parameters.Add(new ValueParameter<IntArray>("Values", "The values of the items.", new IntArray(5)));
-      ValuesParameter.ActualValue.ToStringChanged += new EventHandler(ValuesActualValue_ToStringChanged);
       Parameters.Add(new ValueParameter<DoubleValue>("Penalty", "The penalty value for each unit of overweight.", new DoubleValue(1)));
       Parameters.Add(new ValueParameter<IBinaryVectorCreator>("SolutionCreator", "The operator which should be used to create new Knapsack solutions.", creator));
@@ -160 +174 @@
     }
     public event EventHandler VisualizerChanged;
+    private void OnVisualizerChanged() {
+      if (VisualizerChanged != null)
+        VisualizerChanged(this, EventArgs.Empty);
+    }
+
     public event EventHandler OperatorsChanged;
     private void OnOperatorsChanged() {
@@ -181 +200 @@
       OnEvaluatorChanged();
     }
-
-    void ValuesActualValue_ToStringChanged(object sender, EventArgs e) {
-      ParameterizeSolutionCreator();
-    }
-
-    void WeightsActualValue_ToStringChanged(object sender, EventArgs e) {
-      ParameterizeSolutionCreator();
+    void KnapsackCapacityParameter_ValueChanged(object sender, EventArgs e) {
+      ParameterizeEvaluator();
+    }
+    void WeightsParameter_ValueChanged(object sender, EventArgs e) {
+      ParameterizeEvaluator();
+    }
+    void ValuesParameter_ValueChanged(object sender, EventArgs e) {
+      ParameterizeEvaluator();
+    }
+    void PenaltyParameter_ValueChanged(object sender, EventArgs e) {
+      ParameterizeEvaluator();
     }
     #endregion
@@ -198 +221 @@
       SolutionCreator.BinaryVectorParameter.ActualNameChanged += new EventHandler(SolutionCreator_PermutationParameter_ActualNameChanged);
       EvaluatorParameter.ValueChanged += new EventHandler(EvaluatorParameter_ValueChanged);
+      KnapsackCapacityParameter.ValueChanged += new EventHandler(KnapsackCapacityParameter_ValueChanged);
+      WeightsParameter.ValueChanged += new EventHandler(WeightsParameter_ValueChanged);
+      ValuesParameter.ValueChanged += new EventHandler(ValuesParameter_ValueChanged);
+      PenaltyParameter.ValueChanged += new EventHandler(PenaltyParameter_ValueChanged);
     }
     private void ParameterizeSolutionCreator() {
@@ -209 +236 @@
           (KnapsackEvaluator)Evaluator;
         knapsackEvaluator.BinaryVectorParameter.ActualName = SolutionCreator.BinaryVectorParameter.ActualName;
+        knapsackEvaluator.KnapsackCapacityParameter.ActualName = KnapsackCapacityParameter.Name;
         knapsackEvaluator.WeightsParameter.ActualName = WeightsParameter.Name;
         knapsackEvaluator.ValuesParameter.ActualName = ValuesParameter.Name;
-        knapsackEvaluator.KnapsackCapacityParameter.ActualName = KnapsackCapacityParameter.Name;
         knapsackEvaluator.PenaltyParameter.ActualName = PenaltyParameter.Name;
       }