Changeset 5343

Timestamp:

01/21/11 02:23:56 (14 years ago)

Author:

swagner

Message:

Added base class for multi-objective problems MultiObjectiveProblem<T, U> (#1389)

Location:

trunk/sources/HeuristicLab.Optimization/3.3

Files:

• HeuristicLab.Optimization-3.3.csproj (modified) (2 diffs)
• MultiObjectiveProblem.cs (added)
• SingleObjectiveProblem.cs (modified) (5 diffs)

trunk/sources/HeuristicLab.Optimization/3.3/HeuristicLab.Optimization-3.3.csproj

@@ -12 +12 @@
     <AssemblyName>HeuristicLab.Optimization-3.3</AssemblyName>
     <TargetFrameworkVersion>v4.0</TargetFrameworkVersion>
-    <TargetFrameworkProfile></TargetFrameworkProfile>
+    <TargetFrameworkProfile>
+    </TargetFrameworkProfile>
     <FileAlignment>512</FileAlignment>
     <SignAssembly>true</SignAssembly>
@@ -117 +118 @@
     <Compile Include="Interfaces\IRealVectorDecoder.cs" />
     <Compile Include="Interfaces\IRealVectorEncoder.cs" />
+    <Compile Include="MultiObjectiveProblem.cs" />
     <Compile Include="Problem.cs" />
     <Compile Include="RunCollectionConstraints\RunCollectionComparisonConstraint.cs" />

trunk/sources/HeuristicLab.Optimization/3.3/SingleObjectiveProblem.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.Optimization {
-  [Item("Single Objective Problem", "Represents the base class for a single objective problem.")]
+  [Item("Single-Objective Problem", "A base class for single-objective problems.")]
   [StorableClass]
   public abstract class SingleObjectiveProblem<T, U> : Problem<T, U>, ISingleObjectiveProblem
@@ -37 +37 @@
     [StorableConstructor]
     protected SingleObjectiveProblem(bool deserializing) : base(deserializing) { }
-    protected SingleObjectiveProblem(SingleObjectiveProblem<T, U> original, Cloner cloner)
-      : base(original, cloner) {
-    }
-
+    protected SingleObjectiveProblem(SingleObjectiveProblem<T, U> original, Cloner cloner) : base(original, cloner) { }
     protected SingleObjectiveProblem()
       : base() {
@@ -47 +44 @@
     }
 
-
-    #region properties
-    ISingleObjectiveEvaluator ISingleObjectiveProblem.Evaluator { get { return Evaluator; } }
-
-    public BoolValue Maximization {
-      get { return MaximizationParameter.Value; }
-      protected set { MaximizationParameter.Value = value; }
-    }
     public ValueParameter<BoolValue> MaximizationParameter {
       get { return (ValueParameter<BoolValue>)Parameters[MaximizationParameterName]; }
@@ -61 +50 @@
       get { return MaximizationParameter; }
     }
+    public BoolValue Maximization {
+      get { return MaximizationParameter.Value; }
+      protected set { MaximizationParameter.Value = value; }
+    }
 
-    public DoubleValue BestKnownQuality {
-      get { return BestKnownQualityParameter.Value; }
-      protected set { BestKnownQualityParameter.Value = value; }
-    }
     public ValueParameter<DoubleValue> BestKnownQualityParameter {
       get { return (ValueParameter<DoubleValue>)Parameters[BestKnownQualityParameterName]; }
@@ -72 +61 @@
       get { return BestKnownQualityParameter; }
     }
-    #endregion
+    public DoubleValue BestKnownQuality {
+      get { return BestKnownQualityParameter.Value; }
+      protected set { BestKnownQualityParameter.Value = value; }
+    }
+
+    ISingleObjectiveEvaluator ISingleObjectiveProblem.Evaluator {
+      get { return Evaluator; }
+    }
   }
 }