Changeset 17279

Timestamp:

09/27/19 17:51:35 (5 years ago)

Author:

mkommend

Message:

#2521: Updated single-objective problem to include a static is better method and fixed setter of maximization property.

Location:

branches/2521_ProblemRefactoring

Files:

• HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveProblem.cs (modified) (4 diffs)
• HeuristicLab.Problems.ExternalEvaluation/3.4/SingleObjectiveExternalEvaluationProblem.cs (modified) (3 diffs)

branches/2521_ProblemRefactoring/HeuristicLab.Optimization/3.3/BasicProblems/SingleObjectiveProblem.cs

@@ -38 +38 @@
     where TEncodedSolution : class, IEncodedSolution {
 
-    [Storable] protected IValueParameter<DoubleValue> BestKnownQualityParameter { get; set; }
-    [Storable] protected IValueParameter<BoolValue> MaximizationParameter { get; set; }
+    [Storable] protected IValueParameter<DoubleValue> BestKnownQualityParameter { get; }
+    [Storable] protected IValueParameter<BoolValue> MaximizationParameter { get; }
 
     public double BestKnownQuality {
@@ -60 +60 @@
       protected set {
         if (MaximizationParameter.Value.Value == value) return;
+        MaximizationParameter.ReadOnly = false;
         MaximizationParameter.Value = new BoolValue(value).AsReadOnly();
+        MaximizationParameter.ReadOnly = true;
       }
     }
@@ -73 +75 @@
       ParameterizeOperators();
     }
-  
+
     protected SingleObjectiveProblem() : base() {
-      Parameters.Add(MaximizationParameter = new ValueParameter<BoolValue>("Maximization", "Whether the problem should be maximized (True) or minimized (False).", new BoolValue(false).AsReadOnly()) { Hidden = true, ReadOnly = true });
-      Parameters.Add(BestKnownQualityParameter = new OptionalValueParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this problem."));
+
+      MaximizationParameter = new ValueParameter<BoolValue>("Maximization", "Whether the problem should be maximized (True) or minimized (False).", new BoolValue(false).AsReadOnly()) { Hidden = true, ReadOnly = true };
+      BestKnownQualityParameter = new OptionalValueParameter<DoubleValue>("BestKnownQuality", "The quality of the best known solution of this problem.");
+
+      Parameters.Add(MaximizationParameter);
+      Parameters.Add(BestKnownQualityParameter);
 
       Operators.Add(Evaluator);
@@ -113 +119 @@
     }
 
+    public static bool IsBetter(bool maximization, double quality, double bestQuality) {
+      return (maximization && quality > bestQuality || !maximization && quality < bestQuality);
+    }
+
     public virtual bool IsBetter(double quality, double bestQuality) {
-      return (Maximization && quality > bestQuality || !Maximization && quality < bestQuality);
+      return IsBetter(Maximization, quality, bestQuality);
     }
 

branches/2521_ProblemRefactoring/HeuristicLab.Problems.ExternalEvaluation/3.4/SingleObjectiveExternalEvaluationProblem.cs

@@ -93 +93 @@
     public ExternalEvaluationProblem(TEncoding encoding)
       : base(encoding) {
-      MaximizationParameter.ReadOnly = false;
-      MaximizationParameter.Value = new BoolValue(); // is a read-only boolvalue in base class
+      MaximizationParameter.Value = new BoolValue(); // is a read-only bool value in base class
       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() }));
@@ -148 +147 @@
       try {
         return client.Evaluate(message, GetQualityMessageExtensions());
-      }
-      finally {
+      } finally {
         lock (clientLock) {
           activeClients.Remove(client);
@@ -166 +164 @@
           try {
             MessageBuilder.AddToMessage(variable.Value, variable.Name, protobufBuilder);
-          }
-          catch (ArgumentException ex) {
+          } catch (ArgumentException ex) {
             throw new InvalidOperationException(string.Format("ERROR while building solution message: Parameter {0} cannot be added to the message", Name), ex);
           }