Changeset 5618 for branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisMultiObjectiveProblem.cs

Timestamp:

03/07/11 14:23:26 (14 years ago)

Author:

mkommend

Message:

#1418: Added symbolic data analysis problems.

File:

• branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisMultiObjectiveProblem.cs (copied) (copied from branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/MultiObjectiveSymbolicDataAnalysisProblem.cs) (5 diffs)

branches/DataAnalysis Refactoring/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/SymbolicDataAnalysisMultiObjectiveProblem.cs

@@ -20 +20 @@
 #endregion
 
+using System.Linq;
 using HeuristicLab.Common;
 using HeuristicLab.Core;
@@ -29 +30 @@
 namespace HeuristicLab.Problems.DataAnalysis.Symbolic {
   [StorableClass]
-  public abstract class MultiObjectiveSymbolicDataAnalysisProblem<T, U, V> : SymbolicDataAnalysisProblem<T, U, V>, IMultiObjectiveHeuristicOptimizationProblem
+  public abstract class SymbolicDataAnalysisMultiObjectiveProblem<T, U, V> : SymbolicDataAnalysisProblem<T, U, V>, IMultiObjectiveHeuristicOptimizationProblem
     where T : class,IDataAnalysisProblemData
-    where U : class, ISymbolicDataAnalysisEvaluator<T>, IMultiObjectiveEvaluator
+    where U : class, ISymbolicDataAnalysisMultiObjectiveEvaluator<T>
     where V : class, ISymbolicDataAnalysisSolutionCreator {
     private const string MaximizationParameterName = "Maximization";
@@ -37 +38 @@
 
     #region parameter properties
-    public ValueParameter<BoolArray> MaximizationParameter {
-      get { return (ValueParameter<BoolArray>)Parameters[MaximizationParameterName]; }
+    public IValueParameter<BoolArray> MaximizationParameter {
+      get { return (IValueParameter<BoolArray>)Parameters[MaximizationParameterName]; }
     }
     IParameter IMultiObjectiveHeuristicOptimizationProblem.MaximizationParameter {
@@ -48 +49 @@
     public BoolArray Maximization {
       get { return MaximizationParameter.Value; }
-      protected set { MaximizationParameter.Value = value; }
+      set { MaximizationParameter.Value = value; }
     }
     IMultiObjectiveEvaluator IMultiObjectiveHeuristicOptimizationProblem.Evaluator {
@@ -56 +57 @@
 
     [StorableConstructor]
-    protected MultiObjectiveSymbolicDataAnalysisProblem(bool deserializing) : base(deserializing) { }
-    protected MultiObjectiveSymbolicDataAnalysisProblem(MultiObjectiveSymbolicDataAnalysisProblem<T, U, V> original, Cloner cloner) : base(original, cloner) { }
+    protected SymbolicDataAnalysisMultiObjectiveProblem(bool deserializing) : base(deserializing) { }
+    protected SymbolicDataAnalysisMultiObjectiveProblem(SymbolicDataAnalysisMultiObjectiveProblem<T, U, V> original, Cloner cloner) : base(original, cloner) { }
 
-    public MultiObjectiveSymbolicDataAnalysisProblem()
-      : base() {
+    public SymbolicDataAnalysisMultiObjectiveProblem(T problemData, U evaluator, V solutionCreator)
+      : base(problemData, evaluator, solutionCreator) {
       Parameters.Add(new ValueParameter<BoolArray>(MaximizationParameterName, "Set to false if the problem should be minimized."));
+    }
+
+    protected override void OnEvaluatorChanged() {
+      base.OnEvaluatorChanged();
+      Maximization = new BoolArray(Evaluator.Maximization.ToArray());
     }
   }