Changeset 11753 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/MultiObjectiveScriptableProblem.cs

Timestamp:

01/13/15 18:47:19 (9 years ago)

Author:

mkommend

Message:

#2174: First working version of refactored programmable problem.

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/New/MultiObjectiveScriptableProblem.cs (modified) (6 diffs)

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

@@ -27 +27 @@
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
 
-namespace HeuristicLab.Problems.Programmable.Problems {
+namespace HeuristicLab.Problems.Programmable {
   [Item("Scriptable Problem (multi-objective)", "Represents a multi-objective problem that can be scripted.")]
   [Creatable("1 Test")]
@@ -37 +37 @@
     }
 
-    private MultiObjectiveProblemDefinitionScript ProblemScript {
+    public MultiObjectiveProblemDefinitionScript ProblemScript {
       get { return MultiObjectiveProblemScriptParameter.Value; }
     }
 
-    private IMultiObjectiveProblemDefinition ProblemDefinition {
+    public IMultiObjectiveProblemDefinition ProblemDefinition {
       get { return MultiObjectiveProblemScriptParameter.Value; }
     }
@@ -48 +48 @@
       : base(original, cloner) {
       RegisterEvents();
+      ProblemScript.Compile();
     }
     public override IDeepCloneable Clone(Cloner cloner) { return new MultiObjectiveScriptableProblem(this, cloner); }
@@ -64 +65 @@
     private void AfterDeserialization() {
       RegisterEvents();
+      ProblemScript.Compile();
     }
 
@@ -71 +73 @@
 
     private void OnProblemDefinitionChanged() {
+      Encoding = ProblemDefinition.Encoding;
+      OnOperatorsChanged();
+      OnReset();
     }
 
@@ -84 +89 @@
       ProblemDefinition.Analyze(individuals, qualities, results);
     }
-    public override IEnumerable<Individual> GetNeighbors(Individual individual, IRandom random) {
-      return ProblemDefinition.GetNeighbors(individual, random);
-    }
   }
 }