Changeset 11393 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs

Timestamp:

09/26/14 22:57:18 (10 years ago)

Author:

abeham

Message:

#2174: enabled possibility to set different problem definitions than just scripted ones

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs (modified) (4 diffs)

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

@@ -55 +55 @@
     }
 
-    public IValueParameter<SingleObjectiveScript> ScriptParameter {
-      get { return (IValueParameter<SingleObjectiveScript>)Parameters["Script"]; }
-    }
-
-    public IValueParameter<Configuration> ConfigurationParameter {
+    public IValueParameter<ISingleObjectiveProblemDefinitionHost> ProblemDefinitionParameter {
+      get { return (IValueParameter<ISingleObjectiveProblemDefinitionHost>)Parameters["ProblemDefinition"]; }
+    }
+
+    protected IValueParameter<Configuration> ConfigurationParameter {
       get { return (IValueParameter<Configuration>)Parameters["Configuration"]; }
+    }
+
+    public ISingleObjectiveProblemDefinitionHost ProblemDefinition {
+      get { return ProblemDefinitionParameter.Value; }
+      set { ProblemDefinitionParameter.Value = value; }
     }
 
@@ -76 +81 @@
     public SingleObjectiveProgrammableProblem()
       : base(new SingleObjectiveEvaluator(), new ParameterVectorCreater()) {
-      Parameters.Add(new ValueParameter<SingleObjectiveScript>("Script", "Defines the problem.", new SingleObjectiveScript() { Name = Name }));
+      Parameters.Add(new ValueParameter<ISingleObjectiveProblemDefinitionHost>("ProblemDefinition", "Defines the problem.", new SingleObjectiveProblemDefinitionScript() { Name = Name }));
       Parameters.Add(new ValueParameter<Configuration>("Configuration", "Describes which parameters exist, what they're called, what type they are and their bounds if any."));
 
@@ -100 +105 @@
 
     private void RegisterEventHandlers() {
-      ScriptParameter.ValueChanged += ScriptParameterOnValueChanged;
-      RegisterScriptInstanceChanges();
-    }
-
-    private void ScriptParameterOnValueChanged(object sender, EventArgs eventArgs) {
-      RegisterScriptInstanceChanges();
-    }
-
-    private void RegisterScriptInstanceChanges() {
-      ScriptParameter.Value.InstanceChanged += ScriptOnInstanceChanged;
-      ScriptParameter.Value.NameChanged += ScriptOnNameChanged;
-    }
-
-    private void ScriptOnNameChanged(object sender, EventArgs eventArgs) {
-      if (sender != ScriptParameter.Value) return;
-      Name = ScriptParameter.Value.Name;
+      ProblemDefinitionParameter.ValueChanged += ProblemDefinitionParameterOnValueChanged;
+      RegisterHostInstanceChanges();
+    }
+
+    private void ProblemDefinitionParameterOnValueChanged(object sender, EventArgs eventArgs) {
+      RegisterHostInstanceChanges();
+      Parameterize();
+    }
+
+    private void RegisterHostInstanceChanges() {
+      ProblemDefinitionParameter.Value.InstanceChanged += ProblemDefinitionHostOnInstanceChanged;
+      ProblemDefinitionParameter.Value.NameChanged += ProblemDefinitionHostOnNameChanged;
+    }
+
+    private void ProblemDefinitionHostOnNameChanged(object sender, EventArgs eventArgs) {
+      if (sender != ProblemDefinitionParameter.Value) return;
+      Name = ProblemDefinitionParameter.Value.Name;
     }
 
     protected override void OnNameChanged() {
       base.OnNameChanged();
-      ScriptParameter.Value.Name = Name;
-    }
-
-    protected virtual void ScriptOnInstanceChanged(object sender, EventArgs eventArgs) {
-      var instance = ScriptParameter.Value.Instance;
+      ProblemDefinitionParameter.Value.Name = Name;
+    }
+
+    protected virtual void ProblemDefinitionHostOnInstanceChanged(object sender, EventArgs eventArgs) {
+      Parameterize();
+    }
+
+    protected virtual void Parameterize() {
+      var instance = ProblemDefinitionParameter.Value.Instance;
       if (instance == null) return;
 
-      var configuration = instance.GetConfiguration();
+      Configuration configuration;
+      try {
+        configuration = instance.GetConfiguration();
+      } catch { return; }
       ConfigurationParameter.Value = configuration;
       Maximization.Value = instance.IsMaximizationProblem;
@@ -602 +615 @@
       var generator = new ParameterVectorMoveGenerator();
       generator.ConfigurationParameter.ActualName = ConfigurationParameter.Name;
-      generator.ScriptParameter.ActualName = ScriptParameter.Name;
+      generator.ProblemDefinitionParameter.ActualName = ProblemDefinitionParameter.Name;
 
       var evaluator = new ParameterVectorMoveEvaluator();
       evaluator.ConfigurationParameter.ActualName = ConfigurationParameter.Name;
       evaluator.QualityParameter.ActualName = Evaluator.QualityParameter.ActualName;
-      evaluator.ScriptParameter.ActualName = ScriptParameter.Name;
+      evaluator.ProblemDefinitionParameter.ActualName = ProblemDefinitionParameter.Name;
 
       var maker = new ParameterVectorMoveMaker();