Changeset 11553 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs

Timestamp:

11/15/14 17:30:02 (9 years ago)

Author:

mkommend

Message:

#2174: Adapted binary encoding to new wiring method.

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs (modified) (4 diffs)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs

@@ -176 +176 @@
 
     protected virtual ISolutionCreator ConfigureCreator(IEncoding encoding) {
+      #region Configure RealVector Creator
+      var realEnc = encoding as RealEncoding;
+      if (realEnc != null) {
+        DynamicEncodingParameters.AddRange(realEnc.Parameters);
+        return realEnc.DefaultSolutionCreator;
+      }
+      #endregion
+      #region Configure BinaryVector Creator
+      var binEnc = encoding as BinaryEncoding;
+      if (binEnc != null) {
+        DynamicEncodingParameters.AddRange(binEnc.Parameters);
+        return binEnc.DefaultSolutionCreator;
+      }
+      #endregion
       #region Configure MultiEncoding Creator
       var multiEncoding = encoding as MultiEncoding;
@@ -184 +198 @@
           creator.Operators.Add(ConfigureCreator(enc));
         }
-        return creator;
-      }
-      #endregion
-      #region Configure BinaryVector Creator
-      var binEnc = encoding as BinaryEncoding;
-      if (binEnc != null) {
-        var p = new ValueParameter<IntValue>(binEnc.Name + "Length", binEnc.Length);
-        DynamicEncodingParameters.Add(p);
-
-        var creator = new RandomBinaryVectorCreator();
-        creator.BinaryVectorParameter.ActualName = binEnc.Name;
-        creator.LengthParameter.ActualName = p.Name;
         return creator;
       }
@@ -212 +214 @@
         creator.BoundsParameter.ActualName = b.Name;
         return creator;
-      }
-      #endregion
-      #region Configure RealVector Creator
-      var realEnc = encoding as RealEncoding;
-      if (realEnc != null) {
-        DynamicEncodingParameters.AddRange(realEnc.Parameters);
-        return realEnc.DefaultSolutionCreator;
       }
       #endregion
@@ -784 +779 @@
       var binConfig = (BinaryEncoding)config.Encodings[paramName];
       IBinaryVectorCrossover binXo;
-      if (binConfig.Length.Value > 3) binXo = new Encodings.BinaryVectorEncoding.SinglePointCrossover();
+      if (binConfig.Length > 3) binXo = new Encodings.BinaryVectorEncoding.SinglePointCrossover();
       else binXo = new Encodings.BinaryVectorEncoding.UniformCrossover();
       binXo.ChildParameter.ActualName = paramName;