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

Timestamp:

11/26/14 13:24:20 (9 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/IntegerEncoding.cs (modified) (6 diffs)

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

@@ -61 +61 @@
 
     public override IEnumerable<IValueParameter> Parameters {
-      get { return base.Parameters.Concat(new IValueParameter[] { LengthParameter, BoundsParameter }); }
+      get { return new IValueParameter[] { LengthParameter, BoundsParameter }; }
     }
     #endregion
@@ -94 +94 @@
       if (min >= max) throw new ArgumentException("min must be less than max", "min");
       if (step.HasValue && step.Value <= 0) throw new ArgumentException("step must be greater than zero or null", "step");
+
       Length = length;
       Bounds = new IntMatrix(1, step.HasValue ? 3 : 2);
@@ -99 +100 @@
       Bounds[0, 1] = max;
       if (step.HasValue) Bounds[0, 2] = step.Value;
+
+      SolutionCreator = new UniformRandomIntegerVectorCreator();
       RegisterParameterEvents();
       DiscoverOperators();
-      SolutionCreator = Operators.OfType<UniformRandomIntegerVectorCreator>().Single();
     }
     public IntegerEncoding(string name, int length, IList<int> min, IList<int> max, IList<int> step = null)
@@ -109 +111 @@
       if (step != null && min.Count != step.Count) throw new ArgumentException("step must be of the same length as min or null", "step");
       if (min.Zip(max, (mi, ma) => mi >= ma).Any(x => x)) throw new ArgumentException("min must be less than max in each dimension", "min");
+
       Length = length;
       Bounds = new IntMatrix(min.Count, step != null ? 3 : 2);
@@ -116 +119 @@
         if (step != null) Bounds[i, 2] = step[i];
       }
+
+      SolutionCreator = new UniformRandomIntegerVectorCreator();
       RegisterParameterEvents();
       DiscoverOperators();
-      SolutionCreator = Operators.OfType<UniformRandomIntegerVectorCreator>().Single();
     }
 
@@ -159 +163 @@
       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);
     }
     #endregion