Changeset 13365 for branches/ProblemRefactoring/HeuristicLab.Problems.Programmable

Timestamp:

11/24/15 16:43:32 (9 years ago)

Author:

abeham

Message:

#2521: fixed recreation of programmable problem's encoding

Location:

branches/ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3

Files:

• MultiObjectiveProgrammableProblem.cs (modified) (2 diffs)
• SingleObjectiveProgrammableProblem.cs (modified) (2 diffs)

branches/ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs

@@ -71 +71 @@
       : base() {
       Parameters.Add(new FixedValueParameter<MultiObjectiveProblemDefinitionScript<TEncoding, TSolution>>("ProblemScript", "Defines the problem.",
-        new MultiObjectiveProblemDefinitionScript<TEncoding, TSolution>() { Name = Name, Encoding = Encoding }));
+        new MultiObjectiveProblemDefinitionScript<TEncoding, TSolution>() { Name = Name }));
+      ProblemScript.Encoding = Encoding = (TEncoding)Encoding.Clone();
       RegisterEvents();
     }
@@ -87 +88 @@
       Parameters.Remove("Maximization");
       Parameters.Add(new ValueParameter<BoolArray>("Maximization", "Set to false if the problem should be minimized.", (BoolArray)new BoolArray(Maximization).AsReadOnly()) { Hidden = true });
+      var multiEnc = ProblemScript.Encoding as MultiEncoding;
+      if (multiEnc != null) multiEnc.Clear();
+      ProblemScript.Initialize();
+      Encoding = (TEncoding)ProblemScript.Encoding.Clone();
 
-      ProblemScript.Initialize();
       OnOperatorsChanged();
       OnReset();

branches/ProblemRefactoring/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs

@@ -73 +73 @@
       : base() {
       Parameters.Add(new FixedValueParameter<SingleObjectiveProblemDefinitionScript<TEncoding, TSolution>>("ProblemScript", "Defines the problem.",
-        new SingleObjectiveProblemDefinitionScript<TEncoding, TSolution>() { Name = Name, Encoding = Encoding }));
+        new SingleObjectiveProblemDefinitionScript<TEncoding, TSolution>() { Name = Name }));
+      ProblemScript.Encoding = Encoding = (TEncoding)Encoding.Clone();
       Operators.Add(new BestScopeSolutionAnalyzer());
       RegisterEvents();
@@ -90 +91 @@
       Parameters.Remove("Maximization");
       Parameters.Add(new FixedValueParameter<BoolValue>("Maximization", "Set to false if the problem should be minimized.", (BoolValue)new BoolValue(Maximization).AsReadOnly()) { Hidden = true });
+      var multiEnc = ProblemScript.Encoding as MultiEncoding;
+      if (multiEnc != null) multiEnc.Clear();
       ProblemScript.Initialize();
+      Encoding = (TEncoding)ProblemScript.Encoding.Clone();
 
       OnOperatorsChanged();