Changeset 11880 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/Encodings/Encoding.cs

Timestamp:

02/04/15 00:03:14 (9 years ago)

Author:

abeham

Message:

#2174:

• Added IImprovmentOperator interface to SingleObjectiveImprover
• Added Random parameter to Analyze method and IStochasticOperator interface to the resp. analyzer
• Updated code template text of the compiled single- and multi-objective problem definitions
• Prevent ProblemDefinitionScript from silently ignoring exceptions
• Added equality comparer in Encoding's cloning constructor
• Small adaption of ProblemDefinitionScriptView to changes in new code editor

File:

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

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

@@ -52 +52 @@
         encodingOperators = new HashSet<IOperator>(value, new TypeEqualityComparer<IOperator>());
 
-        T newSolutionCreator = (T)encodingOperators.FirstOrDefault(o => o.GetType() == solutionCreator.GetType());
-        if (newSolutionCreator == null) newSolutionCreator = encodingOperators.OfType<T>().First();
+        T newSolutionCreator = (T)encodingOperators.FirstOrDefault(o => o.GetType() == solutionCreator.GetType()) ??
+                               encodingOperators.OfType<T>().First();
         SolutionCreator = newSolutionCreator;
         OnOperatorsChanged();
@@ -83 +83 @@
     [StorableConstructor]
     protected Encoding(bool deserializing) : base(deserializing) { }
-
     protected Encoding(Encoding<T> original, Cloner cloner)
       : base(original, cloner) {
-      encodingOperators = new HashSet<IOperator>(original.Operators.Select(cloner.Clone));
+      encodingOperators = new HashSet<IOperator>(original.Operators.Select(cloner.Clone), new TypeEqualityComparer<IOperator>());
       solutionCreator = cloner.Clone(original.solutionCreator);
     }
@@ -97 +96 @@
     public void ConfigureOperator(IOperator @operator) { ConfigureOperators(new[] { @operator }); }
     public abstract void ConfigureOperators(IEnumerable<IOperator> operators);
-
 
     public event EventHandler SolutionCreatorChanged;