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

Timestamp:

11/26/14 13:24:20 (10 years ago)

Author:

mkommend

Message:

#2174: Implemented multi-encoding operators and adapated wiring of operators in the programmable problems.

File:

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

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

@@ -62 +62 @@
 
     public override IEnumerable<IValueParameter> Parameters {
-      get { return base.Parameters.Concat(new IValueParameter[] { LengthParameter, BoundsParameter }); }
+      get { return new IValueParameter[] { LengthParameter, BoundsParameter }; }
     }
     #endregion
@@ -101 +101 @@
       lengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
       boundsParameter = new ValueParameter<DoubleMatrix>(Name + "Bounds", bounds);
+
+      SolutionCreator = new UniformRandomRealVectorCreator();
       RegisterParameterEvents();
       DiscoverOperators();
-      SolutionCreator = Operators.OfType<UniformRandomRealVectorCreator>().Single();
     }
 
@@ -119 +120 @@
       lengthParameter = new FixedValueParameter<IntValue>(Name + "Length", new IntValue(length));
       boundsParameter = new ValueParameter<DoubleMatrix>(Name + "Bounds", bounds);
+
+      SolutionCreator = new UniformRandomRealVectorCreator();
       RegisterParameterEvents();
       DiscoverOperators();
-      SolutionCreator = Operators.OfType<UniformRandomRealVectorCreator>().Single();
     }
 
@@ -167 +169 @@
       var discoveredTypes = ApplicationManager.Manager.GetTypes(encodingSpecificOperatorTypes, true, false, false);
       var operators = discoveredTypes.Select(t => (IOperator)Activator.CreateInstance(t));
-      var newOperators = operators.Except(encodingOperators, new TypeEqualityComparer<IOperator>()).ToList();
+      var newOperators = operators.Except(Operators, new TypeEqualityComparer<IOperator>()).ToList();
 
       ConfigureOperators(newOperators);
-      encodingOperators.AddRange(newOperators);
+      foreach (var @operator in newOperators)
+        encodingOperators.Add(@operator);
 
       foreach (var strategyVectorCreator in Operators.OfType<IRealVectorStdDevStrategyParameterCreator>())