Changeset 3894 for trunk/sources/HeuristicLab.Problems.TestFunctions

Timestamp:

06/02/10 21:34:31 (14 years ago)

Author:

abeham

Message:

#1029

• Added Bounds to SingleObjectiveTestFunctionSolution
• This would break persistence, so I added a CompatibilityMethod (which can be removed again once moving to 3.4)

Location:

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3

Files:

• Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs (modified) (4 diffs)
• Interfaces/IBestSingleObjectiveTestFunctionSolutionAnalyzer.cs (modified) (1 diff)
• SingleObjectiveTestFunctionProblem.cs (modified) (1 diff)
• SingleObjectiveTestFunctionSolution.cs (modified) (6 diffs)

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Analyzers/BestSingleObjectiveTestFunctionSolutionAnalyzer.cs

@@ -69 +69 @@
       get { return (IValueLookupParameter<ISingleObjectiveTestFunctionProblemEvaluator>)Parameters["Evaluator"]; }
     }
+    public ILookupParameter<DoubleMatrix> BoundsParameter {
+      get { return (ILookupParameter<DoubleMatrix>)Parameters["Bounds"]; }
+    }
 
+    protected BestSingleObjectiveTestFunctionSolutionAnalyzer(bool deserializing) : base(deserializing) { }
     public BestSingleObjectiveTestFunctionSolutionAnalyzer()
       : base() {
@@ -80 +84 @@
       Parameters.Add(new ValueLookupParameter<ResultCollection>("Results", "The result collection where the SingleObjectiveTestFunction solution should be stored."));
       Parameters.Add(new ValueLookupParameter<ISingleObjectiveTestFunctionProblemEvaluator>("Evaluator", "The evaluator with which the solution is evaluated."));
+      Parameters.Add(new LookupParameter<DoubleMatrix>("Bounds", "The bounds of the function."));
+    }
+
+    /// <summary>
+    /// This method can simply be removed when the plugin version is > 3.3
+    /// </summary>
+    [StorableHook(HookType.AfterDeserialization)]
+    private void CompatibilityMethod() {
+      // Bounds are introduced in 3.3.0.3894
+      if (!Parameters.ContainsKey("Bounds"))
+        Parameters.Add(new LookupParameter<DoubleMatrix>("Bounds", "The bounds of the function."));
     }
 
@@ -85 +100 @@
       ItemArray<RealVector> realVectors = RealVectorParameter.ActualValue;
       ItemArray<DoubleValue> qualities = QualityParameter.ActualValue;
-      ResultCollection results = ResultsParameter.ActualValue;
-      ISingleObjectiveTestFunctionProblemEvaluator evaluator = EvaluatorParameter.ActualValue;
       bool max = MaximizationParameter.ActualValue.Value;
       DoubleValue bestKnownQuality = BestKnownQualityParameter.ActualValue;
+      SingleObjectiveTestFunctionSolution solution = BestSolutionParameter.ActualValue;
 
       int i = qualities.Select((x, index) => new { index, x.Value }).OrderBy(x => x.Value).First().index;
@@ -97 +111 @@
         BestKnownQualityParameter.ActualValue = new DoubleValue(qualities[i].Value);
         BestKnownSolutionParameter.ActualValue = (RealVector)realVectors[i].Clone();
+        if (solution != null)
+          solution.BestKnownRealVector = BestKnownSolutionParameter.ActualValue;
       }
 
-      SingleObjectiveTestFunctionSolution solution = BestSolutionParameter.ActualValue;
       if (solution == null) {
-        solution = new SingleObjectiveTestFunctionSolution(realVectors[i], qualities[i], evaluator);
+        ResultCollection results = ResultsParameter.ActualValue;
+        solution = new SingleObjectiveTestFunctionSolution(realVectors[i], qualities[i], EvaluatorParameter.ActualValue);
         solution.Population = realVectors;
         solution.BestKnownRealVector = BestKnownSolutionParameter.ActualValue;
+        solution.Bounds = BoundsParameter.ActualValue;
         BestSolutionParameter.ActualValue = solution;
         results.Add(new Result("Best Solution", solution));

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Interfaces/IBestSingleObjectiveTestFunctionSolutionAnalyzer.cs

@@ -26 +26 @@
 namespace HeuristicLab.Problems.TestFunctions {
   /// <summary>
-  /// An interface which represents operators for analyzing the best solution of single objective TestFunction Problems given in bit vector representation.
+  /// An interface which represents operators for analyzing the best solution of single objective TestFunction Problems given in real vector representation.
   /// </summary>
   public interface IBestSingleObjectiveTestFunctionSolutionAnalyzer : IAnalyzer {

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionProblem.cs

@@ -307 +307 @@
       BestSingleObjectiveTestFunctionSolutionAnalyzer.MaximizationParameter.ActualName = MaximizationParameter.Name;
       BestSingleObjectiveTestFunctionSolutionAnalyzer.EvaluatorParameter.ActualName = EvaluatorParameter.Name;
+      BestSingleObjectiveTestFunctionSolutionAnalyzer.BoundsParameter.ActualName = BoundsParameter.Name;
     }
     private void InitializeOperators() {

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/SingleObjectiveTestFunctionSolution.cs

@@ -108 +108 @@
     }
 
+    [Storable]
+    private DoubleMatrix bounds;
+    public DoubleMatrix Bounds {
+      get { return bounds; }
+      set {
+        if (bounds != value) {
+          if (bounds != null) DeregisterBoundsEvents();
+          bounds = value;
+          if (bounds != null) RegisterBoundsEvents();
+          OnBoundsChanged();
+        }
+      }
+    }
+
     public SingleObjectiveTestFunctionSolution() : base() { }
     public SingleObjectiveTestFunctionSolution(RealVector realVector, DoubleValue quality, ISingleObjectiveTestFunctionProblemEvaluator evaluator)
@@ -125 +139 @@
       if (bestQuality != null) RegisterQualityEvents();
       if (population != null) RegisterPopulationEvents();
+      if (bounds != null) RegisterBoundsEvents();
     }
 
@@ -135 +150 @@
       clone.population = (ItemArray<RealVector>)cloner.Clone(population);
       clone.evaluator = (ISingleObjectiveTestFunctionProblemEvaluator)cloner.Clone(evaluator);
+      clone.bounds = (DoubleMatrix)cloner.Clone(bounds);
       clone.Initialize();
       return clone;
@@ -175 +191 @@
     }
 
+    public event EventHandler BoundsChanged;
+    private void OnBoundsChanged() {
+      var changed = BoundsChanged;
+      if (changed != null)
+        changed(this, EventArgs.Empty);
+    }
+
     private void RegisterBestKnownRealVectorEvents() {
       BestKnownRealVector.ItemChanged += new EventHandler<EventArgs<int>>(BestKnownRealVector_ItemChanged);
@@ -207 +230 @@
       Population.ItemsReplaced -= new CollectionItemsChangedEventHandler<IndexedItem<RealVector>>(Population_ItemsReplaced);
     }
+    private void RegisterBoundsEvents() {
+      Bounds.ItemChanged += new EventHandler<EventArgs<int, int>>(Bounds_ItemChanged);
+      Bounds.Reset += new EventHandler(Bounds_Reset);
+    }
+    private void DeregisterBoundsEvents() {
+      Bounds.ItemChanged -= new EventHandler<EventArgs<int, int>>(Bounds_ItemChanged);
+      Bounds.Reset -= new EventHandler(Bounds_Reset);
+    }
 
     private void BestKnownRealVector_ItemChanged(object sender, EventArgs<int> e) {
@@ -231 +262 @@
     private void Population_CollectionReset(object sender, CollectionItemsChangedEventArgs<IndexedItem<RealVector>> e) {
       OnPopulationChanged();
+    }
+    private void Bounds_ItemChanged(object sender, EventArgs<int, int> e) {
+      OnBoundsChanged();
+    }
+    private void Bounds_Reset(object sender, EventArgs e) {
+      OnBoundsChanged();
     }
     #endregion