Changeset 11998

Timestamp:

02/13/15 12:18:20 (10 years ago)

Author:

mkommend

Message:

#2174: Fixed Maximization handling and plugin dependencies.

Location:

trunk/sources

Files:

• HeuristicLab.Optimization/3.3/BasicProblems/BasicProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/Plugin.cs.frame (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Optimization/3.3/BasicProblems/BasicProblem.cs

@@ -67 +67 @@
       Parameters.Add(new ValueParameter<TEncoding>("Encoding", "Describes the configuration of the encoding, what the variables are called, what type they are and their bounds if any."));
       oldEncoding = Encoding;
-      Parameterize();
+      if(Encoding != null) Parameterize();
       RegisterEvents();
     }

trunk/sources/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs

@@ -83 +83 @@
 
     public override bool[] Maximization {
-      get { return ProblemDefinition.Maximization; }
+      get { return Parameters.ContainsKey("ProblemScript") ? ProblemDefinition.Maximization : new []{false}; }
     }
 

trunk/sources/HeuristicLab.Problems.Programmable/3.3/Plugin.cs.frame

@@ -30 +30 @@
   [PluginDependency("HeuristicLab.Common.Resources", "3.3")]
   [PluginDependency("HeuristicLab.Core", "3.3")]
+  [PluginDependency("HeuristicLab.Data", "3.3")]
   [PluginDependency("HeuristicLab.Optimization", "3.3")]
   [PluginDependency("HeuristicLab.Parameters", "3.3")]

trunk/sources/HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs

@@ -86 +86 @@
 
     public override bool Maximization {
-      get { return ProblemDefinition.Maximization; }
+      get { return Parameters.ContainsKey("ProblemScript") ? ProblemDefinition.Maximization : false; }
     }