Changeset 11885 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/BasicProblem.cs

Timestamp:

02/04/15 13:28:37 (10 years ago)

Author:

abeham

Message:

#2174:

• Some refactorings and bug fixes
• Renamed (Binary|Integer|Real)Encoding to (Binary|Integer|Real)VectorEncoding
• Improved error messages when compiling programmable problems

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/BasicProblem.cs (modified) (2 diffs)

branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/BasicProblem.cs

@@ -126 +126 @@
         foreach (var multi in nestedEncodings)
           AdaptEncodingOperators(multi.oldEnc, multi.newEnc);
-
-        foreach (var op in oldMultiEncoding.Operators.OfType<IMultiEncodingOperator>())
-          foreach (var multi in nestedEncodings)
-            op.ReplaceEncoding(multi.oldEnc, multi.newEnc);
       }
 
@@ -137 +133 @@
       var newOperators = newEncoding.Operators;
 
-
-      var operators = oldOperators.Intersect(newOperators, comparer).Select(op => cloner.Clone(op));
-      operators = operators.Union(newOperators, comparer).ToList();
+      cloner.RegisterClonedObject(oldEncoding, newEncoding);
+      var operators = oldOperators.Intersect(newOperators, comparer)
+                                  .Select(cloner.Clone)
+                                  .Union(newOperators, comparer).ToList();
 
       newEncoding.ConfigureOperators(operators);