Changeset 11543 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs

Timestamp:

11/12/14 17:52:15 (10 years ago)

Author:

mkommend

Message:

#2174: Refactoring of encodings to allow wiring of operators within the encoding instead of the problem (work in progress).

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs (modified) (3 diffs)

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

@@ -143 +143 @@
       if (definition == null) return;
 
-      Encoding encoding;
-      try {
-        encoding = definition.Encoding;
-      } catch { return; }
+      Encoding encoding = definition.Encoding;
+
       EncodingParameter.Value = encoding;
       Maximization.Value = definition.IsMaximizationProblem;
@@ -225 +223 @@
       var realEnc = encoding as RealEncoding;
       if (realEnc != null) {
-        var l = new ValueParameter<IntValue>(realEnc.Name + "Length", realEnc.Length);
-        var b = new ValueParameter<DoubleMatrix>(realEnc.Name + "Bounds", realEnc.Bounds);
-        DynamicEncodingParameters.Add(l);
-        DynamicEncodingParameters.Add(b);
-
-        var creator = new UniformRandomRealVectorCreator();
-        creator.RealVectorParameter.ActualName = realEnc.Name;
-        creator.LengthParameter.ActualName = l.Name;
-        creator.BoundsParameter.ActualName = b.Name;
-        return creator;
+        DynamicEncodingParameters.AddRange(realEnc.EncodingParameters);        
+        return realEnc.SolutionCreator;
       }
       #endregion
@@ -463 +453 @@
           .Union(ApplicationManager.Manager.GetInstances<IRealVectorStdDevStrategyParameterOperator>(), new TypeEqualityComparer<IRealVectorStdDevStrategyParameterOperator>())
           .ToList();
-        var problemSize = ((RealEncoding)encoding).Length.Value;
+        var problemSize = ((RealEncoding)encoding).Length;
         var bounds = (DoubleMatrix)((RealEncoding)encoding).Bounds.Clone();
         for (var i = 0; i < bounds.Rows; i++) {