Changeset 13631 for stable

Timestamp:

02/23/16 22:04:59 (9 years ago)

Author:

abeham

Message:

#2551: merged r13491,r13498,r13500 to stable

Location:

stable

Files:

• . (modified) (1 prop)
• HeuristicLab.Problems.ExternalEvaluation/3.4/ExternalEvaluationProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.4/MultiObjectiveExternalEvaluationProblem.cs (modified) (2 diffs)

stable/HeuristicLab.Problems.ExternalEvaluation/3.4/ExternalEvaluationProblem.cs

@@ -59 +59 @@
       get { return (IFixedValueParameter<SingleObjectiveOptimizationSupportScript>)Parameters["SupportScript"]; }
     }
+
+    private IFixedValueParameter<BoolValue> MaximizationParameter {
+      get { return (IFixedValueParameter<BoolValue>)Parameters["Maximization"]; }
+    }
     #endregion
 
     #region Properties
+    public new IEncoding Encoding {
+      get { return base.Encoding; }
+      set { base.Encoding = value; }
+    }
     public EvaluationCache Cache {
       get { return CacheParameter.Value; }
@@ -100 +108 @@
     public override bool Maximization {
       get { return Parameters.ContainsKey("Maximization") && ((IValueParameter<BoolValue>)Parameters["Maximization"]).Value.Value; }
+    }
+
+    public virtual void SetMaximization(bool maximization) {
+      MaximizationParameter.Value.Value = maximization;
     }
 

stable/HeuristicLab.Problems.ExternalEvaluation/3.4/MultiObjectiveExternalEvaluationProblem.cs

@@ -56 +56 @@
       get { return (IFixedValueParameter<MultiObjectiveOptimizationSupportScript>)Parameters["SupportScript"]; }
     }
+
+    private IFixedValueParameter<BoolArray> MaximizationParameter {
+      get { return (IFixedValueParameter<BoolArray>)Parameters["Maximization"]; }
+    }
     #endregion
 
     #region Properties
+    public new IEncoding Encoding {
+      get { return base.Encoding; }
+      set { base.Encoding = value; }
+    }
     public EvaluationCache Cache {
       get { return CacheParameter.Value; }
@@ -97 +105 @@
         return Parameters.ContainsKey("Maximization") ? ((IValueParameter<BoolArray>)Parameters["Maximization"]).Value.ToArray() : new bool[0];
       }
+    }
+
+    public virtual void SetMaximization(bool[] maximization) {
+      ((IStringConvertibleArray)MaximizationParameter.Value).Length = maximization.Length;
+      var array = MaximizationParameter.Value;
+      for (var i = 0; i < maximization.Length; i++)
+        array[i] = maximization[i];
     }