Changeset 17225 for branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Problem.cs

Timestamp:

08/29/19 13:53:26 (5 years ago)

Author:

mkommend

Message:

#2521: Integrated changes of #2943 into problem refactoring branch.

File:

• branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Problem.cs (modified) (5 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/Problem.cs

@@ -36 +36 @@
     where TEncodedSolution : class, IEncodedSolution
     where TEvaluator : class, IEvaluator {
-
     public string Filename { get; set; } // TODO: Really okay here? should be in Problem (non-generic)
 
@@ -60 +59 @@
     }
     event EventHandler IHeuristicOptimizationProblem.SolutionCreatorChanged {
-      add { Encoding.SolutionCreatorChanged += value; }
-      remove { Encoding.SolutionCreatorChanged -= value; }
+      add {
+        if (Encoding != null) Encoding.SolutionCreatorChanged += value;
+      }
+      remove {
+        if (Encoding != null) Encoding.SolutionCreatorChanged -= value;
+      }
     }
 
@@ -72 +75 @@
       protected set { EvaluatorParameter.Value = value; }
     }
-    IEvaluator IHeuristicOptimizationProblem.Evaluator { get { return Evaluator; } }
-    IParameter IHeuristicOptimizationProblem.EvaluatorParameter { get { return EvaluatorParameter; } }
+    IEvaluator IHeuristicOptimizationProblem.Evaluator {
+      get { return Evaluator; }
+    }
+    IParameter IHeuristicOptimizationProblem.EvaluatorParameter {
+      get { return EvaluatorParameter; }
+    }
 
     public event EventHandler EvaluatorChanged;
@@ -90 +97 @@
       get {
         if (Encoding == null) return base.ExecutionContextItems;
-        return base.ExecutionContextItems.Concat(new[] { Encoding });
+        return base.ExecutionContextItems.Concat(new[] {Encoding});
       }
     }
@@ -173 +180 @@
         if (!oldMultiEncoding.Encodings.SequenceEqual(newMultiEncoding.Encodings, new TypeEqualityComparer<IEncoding>())) return;
 
-        var nestedEncodings = oldMultiEncoding.Encodings.Zip(newMultiEncoding.Encodings, (o, n) => new { oldEnc = o, newEnc = n });
+        var nestedEncodings = oldMultiEncoding.Encodings.Zip(newMultiEncoding.Encodings, (o, n) => new {oldEnc = o, newEnc = n});
         foreach (var multi in nestedEncodings)
           AdaptEncodingOperators(multi.oldEnc, multi.newEnc);