Changeset 12002 for trunk

Timestamp:

02/13/15 13:21:00 (10 years ago)

Author:

abeham

Message:

#2174:

• Reopened maximization parameter in ExternalEvaluationProblem
• Added hidden flag to maximization parameter in multi-objective programmable problem

Location:

trunk/sources

Files:

• HeuristicLab.Problems.ExternalEvaluation/3.4/ExternalEvaluationProblem.cs (modified) (1 diff)
• HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProgrammableProblem.cs (modified) (2 diffs)
• HeuristicLab.Problems.Programmable/3.3/SingleObjectiveProgrammableProblem.cs (modified) (1 diff)

trunk/sources/HeuristicLab.Problems.ExternalEvaluation/3.4/ExternalEvaluationProblem.cs

@@ -85 +85 @@
     public ExternalEvaluationProblem()
       : base() {
+      Parameters.Remove("Maximization"); // readonly in base class
+      Parameters.Add(new FixedValueParameter<BoolValue>("Maximization", "Set to false if the problem should be minimized.", new BoolValue()));
       Parameters.Add(new OptionalValueParameter<EvaluationCache>("Cache", "Cache of previously evaluated solutions."));
       Parameters.Add(new ValueParameter<CheckedItemCollection<IEvaluationServiceClient>>("Clients", "The clients that are used to communicate with the external application.", new CheckedItemCollection<IEvaluationServiceClient>() { new EvaluationServiceClient() }));

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

@@ -74 +74 @@
 
     private void OnProblemDefinitionChanged() {
-      if (Parameters.ContainsKey("Maximization")) Parameters.Remove("Maximization");
-      Parameters.Add(new ValueParameter<BoolArray>("Maximization", "Set to false if the problem should be minimized.", (BoolArray)new BoolArray(Maximization).AsReadOnly()));
+      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 });
 
       Encoding = ProblemDefinition.Encoding;
@@ -83 +83 @@
 
     public override bool[] Maximization {
-      get { return Parameters.ContainsKey("ProblemScript") ? ProblemDefinition.Maximization : new []{false}; }
+      get { return Parameters.ContainsKey("ProblemScript") ? ProblemDefinition.Maximization : new[] { false }; }
     }
 

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

@@ -77 +77 @@
 
     private void OnProblemDefinitionChanged() {
-      if (Parameters.ContainsKey("Maximization")) Parameters.Remove("Maximization");
+      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 });