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

Timestamp:

11/26/14 16:09:14 (10 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/RealEncoding.cs (modified) (5 diffs)

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

@@ -37 +37 @@
   public sealed class RealEncoding : Encoding<IRealVectorCreator> {
     #region Encoding Parameters
-    [Storable]
     private IFixedValueParameter<IntValue> lengthParameter;
     public IFixedValueParameter<IntValue> LengthParameter {
@@ -43 +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<DoubleMatrix> boundsParameter;
     public IValueParameter<DoubleMatrix> BoundsParameter {
@@ -56 +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
@@ -99 +100 @@
       bounds[0, 1] = max;
 
-      lengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
-      boundsParameter = new ValueParameter<DoubleMatrix>(Name + "Bounds", bounds);
+      LengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
+      BoundsParameter = new ValueParameter<DoubleMatrix>(Name + "Bounds", bounds);
 
       SolutionCreator = new UniformRandomRealVectorCreator();
@@ -118 +119 @@
         bounds[i, 1] = max[i];
       }
-      lengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
-      boundsParameter = new ValueParameter<DoubleMatrix>(Name + "Bounds", bounds);
+      LengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
+      BoundsParameter = new ValueParameter<DoubleMatrix>(Name + "Bounds", bounds);
 
       SolutionCreator = new UniformRandomRealVectorCreator();