Changeset 12387 for branches/PTSP

Timestamp:

05/09/15 17:26:10 (9 years ago)

Author:

apolidur

Message:

#2221: Fixing RealizationsSize parameter not updating

Location:

branches/PTSP/HeuristicLab.Problems.PTSP/3.3

Files:

• EstimatedPTSP.cs (modified) (6 diffs)
• PTSP.cs (modified) (2 diffs)

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/EstimatedPTSP.cs

@@ -23 +23 @@
 
     #region Parameter Properties
-    public IValueParameter<ItemList<ItemList<IntValue>>> RealizationsParameter {
-      get { return (IValueParameter<ItemList<ItemList<IntValue>>>)Parameters["Realizations"]; }
+    public ValueParameter<ItemList<ItemList<IntValue>>> RealizationsParameter {
+      get { return (ValueParameter<ItemList<ItemList<IntValue>>>)Parameters["Realizations"]; }
     }
+    public ValueParameter<IntValue> RealizationsSizeParameter {
+      get { return (ValueParameter<IntValue>)Parameters["RealizationsSize"]; }
+    }
+
     #endregion
 
@@ -33 +37 @@
       set { RealizationsParameter.Value = value; }
     }
+
+    public IntValue RealizationsSize {
+      get { return RealizationsSizeParameter.Value; }
+      set { RealizationsSizeParameter.Value = value; }
+    }
     #endregion
 
@@ -39 +48 @@
     private EstimatedProbabilisticTravelingSalesmanProblem(EstimatedProbabilisticTravelingSalesmanProblem original, Cloner cloner)
       : base(original, cloner) {
+      RegisterEventHandlers();
+    }
+    public EstimatedProbabilisticTravelingSalesmanProblem() {
+      Parameters.Add(new ValueParameter<IntValue>("RealizationsSize", "Size of the sample for the estimation-based evaluation"));
+      Parameters.Add(new ValueParameter<ItemList<ItemList<IntValue>>>("Realizations", "The concrete..."));
+      Operators.Add(new PTSPEstimatedInversionEvaluator());
+      Operators.Add(new PTSPEstimatedInsertionEvaluator());
+      Operators.Add(new PTSPExhaustiveInversionLocalImprovement());
+      Operators.Add(new PTSPExhaustiveInsertionLocalImprovement());
+
+      Operators.Add(new Exhaustive25MoveGenerator());
+      Operators.Add(new Stochastic25MultiMoveGenerator());
+      Operators.Add(new Stochastic25SingleMoveGenerator());
+      Operators.Add(new TwoPointFiveMoveMaker());
+      Operators.Add(new PTSP25MoveEvaluator());
+
+      Encoding.ConfigureOperators(Operators.OfType<IOperator>());
+      foreach (var twopointfiveMoveOperator in Operators.OfType<I25MoveOperator>()) {
+        twopointfiveMoveOperator.TwoPointFiveMoveParameter.ActualName = "Permutation.TwoPointFiveMove";
+      }
+      RealizationsSize = new IntValue(100);
+      RegisterEventHandlers();
     }
 
@@ -101 +132 @@
     }
 
-    public EstimatedProbabilisticTravelingSalesmanProblem() {
-      Parameters.Add(new ValueParameter<IntValue>("RealizationsSize", "Size of the sample for the estimation-based evaluation"));
-      Parameters.Add(new ValueParameter<ItemList<ItemList<IntValue>>>("Realizations", "The concrete..."));
-      Operators.Add(new PTSPEstimatedInversionEvaluator());
-      Operators.Add(new PTSPEstimatedInsertionEvaluator());
-      Operators.Add(new PTSPExhaustiveInversionLocalImprovement());
-      Operators.Add(new PTSPExhaustiveInsertionLocalImprovement());
+    
 
-      Operators.Add(new Exhaustive25MoveGenerator());
-      Operators.Add(new Stochastic25MultiMoveGenerator());
-      Operators.Add(new Stochastic25SingleMoveGenerator());
-      Operators.Add(new TwoPointFiveMoveMaker());
-      Operators.Add(new PTSP25MoveEvaluator());
-
-      Encoding.ConfigureOperators(Operators.OfType<IOperator>());
-      foreach (var twopointfiveMoveOperator in Operators.OfType<I25MoveOperator>()) {
-        twopointfiveMoveOperator.TwoPointFiveMoveParameter.ActualName = "Permutation.TwoPointFiveMove";
-      }
+    private void RegisterEventHandlers() {
+      //RealizationsSizeParameter.ValueChanged += new EventHandler(RealizationsSizeParameter_ValueChanged);
+      RealizationsSize.ValueChanged += new EventHandler(RealizationsSizeParameter_ValueChanged);
+      //RealizationsSizeParameter.Value.ValueChanged += new EventHandler(RealizationsSizeParameter_ValueChanged);
     }
 
-    public override void Load(PTSPData data) {
-      base.Load(data);
-      RealizationsSize = new IntValue(100);
+    private void RealizationsSizeParameter_ValueChanged(object sender, EventArgs e) {
+      UpdateRealizations();
+    }
+
+    private void UpdateRealizations() {
       MersenneTwister r = new MersenneTwister();
-
-      // TODO : This should be made in another function and attached to a listener
       int countOnes = 0;
       Realizations = new ItemList<ItemList<IntValue>>(RealizationsSize.Value);
@@ -134 +153 @@
           countOnes = 0;
           newRealization.Clear();
-          for (int j = 0; j < data.Dimension; j++) {
+          for (int j = 0; j < DistanceMatrix.Rows; j++) {
             if (ProbabilityMatrix[j] > r.NextDouble()) {
               newRealization.Add(new IntValue(1));
@@ -146 +165 @@
         Realizations.Add(newRealization);
       }
+    }
+
+    public override void Load(PTSPData data) {
+      base.Load(data);
+      UpdateRealizations();
 
       foreach (var op in Operators.OfType<PTSPMoveEvaluator>()) {

branches/PTSP/HeuristicLab.Problems.PTSP/3.3/PTSP.cs

@@ -59 +59 @@
       get { return (ValueParameter<DoubleArray>)Parameters["ProbabilityMatrix"]; }
     }
-    public ValueParameter<IntValue> RealizationsSizeParameter {
-      get { return (ValueParameter<IntValue>)Parameters["RealizationsSize"]; }
-    }
+    
 
     #endregion
@@ -86 +84 @@
       set { ProbabilityMatrixParameter.Value = value; }
     }
-    public IntValue RealizationsSize {
-      get { return RealizationsSizeParameter.Value; }
-      set { RealizationsSizeParameter.Value = value; }
-    }
+    
     #endregion