Changeset 11588 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/IntegerEncoding.cs

Timestamp:

11/26/14 16:09:14 (9 years ago)

Author:

mkommend

Message:

#2174: Adapted encodings to store its specific parameters in the standard parameter collection.

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/IntegerEncoding.cs (modified) (6 diffs)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/IntegerEncoding.cs

@@ -28 +28 @@
 using HeuristicLab.Encodings.IntegerVectorEncoding;
 using HeuristicLab.Optimization;
+using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 using HeuristicLab.PluginInfrastructure;
@@ -36 +37 @@
   public class IntegerEncoding : Encoding<IIntegerVectorCreator> {
     #region Encoding Parameters
-    [Storable]
     private IFixedValueParameter<IntValue> lengthParameter;
     public IFixedValueParameter<IntValue> LengthParameter {
@@ -42 +42 @@
       set {
         if (value == null) throw new ArgumentNullException("Length parameter must not be null.");
+        if (value.Value == null) throw new ArgumentNullException("Length parameter value must not be null.");
         if (lengthParameter == value) return;
+
+        if (lengthParameter != null) Parameters.Remove(lengthParameter);
         lengthParameter = value;
+        Parameters.Add(lengthParameter);
         OnLengthParameterChanged();
       }
     }
 
-    [Storable]
     private IValueParameter<IntMatrix> boundsParameter;
     public IValueParameter<IntMatrix> BoundsParameter {
@@ -55 +58 @@
         if (value == null) throw new ArgumentNullException("Bounds parameter must not be null.");
         if (boundsParameter == value) return;
+
+        if (boundsParameter != null) Parameters.Remove(boundsParameter);
         boundsParameter = value;
+        Parameters.Add(boundsParameter);
         OnBoundsParameterChanged();
       }
-    }
-
-    public override IEnumerable<IValueParameter> Parameters {
-      get { return new IValueParameter[] { LengthParameter, BoundsParameter }; }
     }
     #endregion
@@ -95 +97 @@
       if (step.HasValue && step.Value <= 0) throw new ArgumentException("step must be greater than zero or null", "step");
 
-      Length = length;
-      Bounds = new IntMatrix(1, step.HasValue ? 3 : 2);
-      Bounds[0, 0] = min;
-      Bounds[0, 1] = max;
-      if (step.HasValue) Bounds[0, 2] = step.Value;
+      var bounds = new IntMatrix(1, step.HasValue ? 3 : 2);
+      bounds[0, 0] = min;
+      bounds[0, 1] = max;
+      if (step.HasValue) bounds[0, 2] = step.Value;
+
+      LengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
+      BoundsParameter = new ValueParameter<IntMatrix>(Name + "Bounds", bounds);
 
       SolutionCreator = new UniformRandomIntegerVectorCreator();
@@ -112 +116 @@
       if (min.Zip(max, (mi, ma) => mi >= ma).Any(x => x)) throw new ArgumentException("min must be less than max in each dimension", "min");
 
-      Length = length;
-      Bounds = new IntMatrix(min.Count, step != null ? 3 : 2);
+      var bounds = new IntMatrix(min.Count, step != null ? 3 : 2);
       for (int i = 0; i < min.Count; i++) {
-        Bounds[i, 0] = min[i];
-        Bounds[i, 1] = max[i];
-        if (step != null) Bounds[i, 2] = step[i];
-      }
+        bounds[i, 0] = min[i];
+        bounds[i, 1] = max[i];
+        if (step != null) bounds[i, 2] = step[i];
+      }
+
+      LengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
+      BoundsParameter = new ValueParameter<IntMatrix>(Name + "Bounds", bounds);
 
       SolutionCreator = new UniformRandomIntegerVectorCreator();