Changeset 11485 for branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProblemDefinition.cs

Timestamp:

10/21/14 19:10:35 (10 years ago)

Author:

abeham

Message:

#2174:

• fixed some bugs
• changed IsMaximizationProblem/Maximization to be an abstract property
• changed Analyze to include an empty virtual definition

File:

• branches/ProgrammableProblem/HeuristicLab.Problems.Programmable/3.3/MultiObjectiveProblemDefinition.cs (modified) (2 diffs)

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

@@ -20 +20 @@
 #endregion
 
-using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -29 +28 @@
   [Item("Multi-objective Problem Definition", "Base class for custom multi-objective problem definitions.")]
   public abstract class MultiObjectiveProblemDefinition : ProblemDefinition, IMultiObjectiveProblemDefinition {
-    [Storable(Name = "Storable")]
-    private bool[] maximization;
-    public bool[] Maximization {
-      get { return maximization; }
-      set {
-        if (maximization.SequenceEqual(value)) return;
-        maximization = value;
-        OnProblemDefinitionChanged();
-      }
-    }
 
+    public abstract bool[] Maximization { get; }
     public abstract double[] Evaluate(IRandom random, Individual vector);
-
-    public abstract void Analyze(Individual[] vectors, double[][] qualities, ResultCollection results);
+    public virtual void Analyze(Individual[] vectors, double[][] qualities, ResultCollection results) { }
 
     [StorableConstructor]
     protected MultiObjectiveProblemDefinition(bool deserializing) : base(deserializing) { }
-    protected MultiObjectiveProblemDefinition(MultiObjectiveProblemDefinition original, Cloner cloner)
-      : base(original, cloner) {
-      this.maximization = (bool[])original.maximization.Clone();
-    }
+    protected MultiObjectiveProblemDefinition(MultiObjectiveProblemDefinition original, Cloner cloner) : base(original, cloner) { }
     protected MultiObjectiveProblemDefinition(Encoding encoding) : this(encoding, "MultiObjectiveProblemDefinition", null) { }
     protected MultiObjectiveProblemDefinition(Encoding encoding, string name) : this(encoding, name, null) { }
-    protected MultiObjectiveProblemDefinition(Encoding encoding, string name, string description)
-      : base(encoding) { }
+    protected MultiObjectiveProblemDefinition(Encoding encoding, string name, string description) : base(encoding, name, description) { }
   }
 }