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

Timestamp:

11/13/14 16:46:40 (9 years ago)

Author:

mkommend

Message:

#2174: Updated IEncoding interface, adapted problems and refactored operator discovery in realencoding

File:

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

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

@@ -58 +58 @@
     }
 
-    protected IValueParameter<Encoding> EncodingParameter {
-      get { return (IValueParameter<Encoding>)Parameters["Encoding"]; }
+    protected IValueParameter<IEncoding> EncodingParameter {
+      get { return (IValueParameter<IEncoding>)Parameters["Encoding"]; }
     }
 
@@ -80 +80 @@
       : base(new MultiObjectiveEvaluator(), new MultiEncodingCreator()) {
       Parameters.Add(new ValueParameter<IMultiObjectiveProblemDefinition>("ProblemDefinition", "Defines the problem.", new MultiObjectiveProblemScript() { Name = Name }));
-      Parameters.Add(new ValueParameter<Encoding>("Encoding", "Describes which parameters exist, what they're called, what type they are and their bounds if any."));
+      Parameters.Add(new ValueParameter<IEncoding>("Encoding", "Describes which parameters exist, what they're called, what type they are and their bounds if any."));
 
       DynamicEncodingParameters = new List<IParameter>();
@@ -140 +140 @@
       if (definition == null) return;
 
-      Encoding encoding = definition.Encoding;
+      IEncoding encoding = definition.Encoding;
       EncodingParameter.Value = encoding;
       Maximization = new BoolArray(definition.Maximization);
@@ -175 +175 @@
     }
 
-    protected virtual ISolutionCreator ConfigureCreator(Encoding encoding) {
+    protected virtual ISolutionCreator ConfigureCreator(IEncoding encoding) {
       #region Configure MultiEncoding Creator
       var multiEncoding = encoding as MultiEncoding;
@@ -217 +217 @@
       var realEnc = encoding as RealEncoding;
       if (realEnc != null) {
-        DynamicEncodingParameters.AddRange(realEnc.EncodingParameters);
+        DynamicEncodingParameters.AddRange(realEnc.Parameters);
         return realEnc.DefaultSolutionCreator;
       }
@@ -237 +237 @@
     }
 
-    protected virtual void ConfigureSingleEncodingOperators(ISolutionCreator newCreator, Encoding encoding) {
+    protected virtual void ConfigureSingleEncodingOperators(ISolutionCreator newCreator, IEncoding encoding) {
       // remove all multiencoding operators
       Operators.RemoveAll(x => x is MultiEncodingCrossover