Changeset 3665 for trunk/sources/HeuristicLab.Problems.TestFunctions/3.3

Timestamp:

05/06/10 05:02:15 (14 years ago)

Author:

abeham

Message:

#934

• added visualization for test functions

Location:

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3

Files:

• Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs (modified) (1 diff)
• Interfaces/ISingleObjectiveTestFunctionProblemEvaluator.cs (modified) (1 diff)
• SingleObjectiveTestFunctionSolution.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs

@@ -84 +84 @@
     }
 
+    public virtual double Evaluate2D(double x, double y) {
+      return EvaluateFunction(new RealVector(new double[] { x, y }));
+    }
+
     /// <summary>
     /// Evaluates the test function for a specific <paramref name="point"/>.

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

@@ -38 +38 @@
 
     ILookupParameter<RealVector> PointParameter { get; }
+
+    double Evaluate2D(double x, double y);
   }
 }

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

@@ -60 +60 @@
       set {
         if (bestRealVector != value) {
-          if (bestRealVector != null) DeregisterRealVectorEvents();
+          if (bestRealVector != null) DeregisterBestRealVectorEvents();
           bestRealVector = value;
-          if (bestRealVector != null) RegisterRealVectorEvents();
-          OnRealVectorChanged();
+          if (bestRealVector != null) RegisterBestRealVectorEvents();
+          OnBestRealVectorChanged();
         }
       }
@@ -106 +106 @@
         }
       }
-    }
-
-    private Image fitnessLandscape;
-    public Image FitnessLandscape {
-      get { return fitnessLandscape; }
-      set { fitnessLandscape = value; }
     }
 
@@ -128 +122 @@
     private void Initialize() {
       if (bestKnownRealVector != null) RegisterBestKnownRealVectorEvents();
-      if (bestRealVector != null) RegisterRealVectorEvents();
+      if (bestRealVector != null) RegisterBestRealVectorEvents();
       if (bestQuality != null) RegisterQualityEvents();
       if (population != null) RegisterPopulationEvents();
@@ -141 +135 @@
       clone.population = (ItemArray<RealVector>)cloner.Clone(population);
       clone.evaluator = (ISingleObjectiveTestFunctionProblemEvaluator)cloner.Clone(evaluator);
-      clone.fitnessLandscape = null;
       clone.Initialize();
       return clone;
@@ -154 +147 @@
     }
 
-    public event EventHandler RealVectorChanged;
-    private void OnRealVectorChanged() {
-      var changed = RealVectorChanged;
+    public event EventHandler BestRealVectorChanged;
+    private void OnBestRealVectorChanged() {
+      var changed = BestRealVectorChanged;
       if (changed != null)
         changed(this, EventArgs.Empty);
@@ -190 +183 @@
       BestKnownRealVector.Reset -= new EventHandler(BestKnownRealVector_Reset);
     }
-    private void RegisterRealVectorEvents() {
-      BestRealVector.ItemChanged += new EventHandler<EventArgs<int>>(RealVector_ItemChanged);
-      BestRealVector.Reset += new EventHandler(RealVector_Reset);
-    }
-    private void DeregisterRealVectorEvents() {
-      BestRealVector.ItemChanged -= new EventHandler<EventArgs<int>>(RealVector_ItemChanged);
-      BestRealVector.Reset -= new EventHandler(RealVector_Reset);
+    private void RegisterBestRealVectorEvents() {
+      BestRealVector.ItemChanged += new EventHandler<EventArgs<int>>(BestRealVector_ItemChanged);
+      BestRealVector.Reset += new EventHandler(BestRealVector_Reset);
+    }
+    private void DeregisterBestRealVectorEvents() {
+      BestRealVector.ItemChanged -= new EventHandler<EventArgs<int>>(BestRealVector_ItemChanged);
+      BestRealVector.Reset -= new EventHandler(BestRealVector_Reset);
     }
     private void RegisterQualityEvents() {
@@ -221 +214 @@
       OnBestKnownRealVectorChanged();
     }
-    private void RealVector_ItemChanged(object sender, EventArgs<int> e) {
-      OnRealVectorChanged();
-    }
-    private void RealVector_Reset(object sender, EventArgs e) {
-      OnRealVectorChanged();
+    private void BestRealVector_ItemChanged(object sender, EventArgs<int> e) {
+      OnBestRealVectorChanged();
+    }
+    private void BestRealVector_Reset(object sender, EventArgs e) {
+      OnBestRealVectorChanged();
     }
     private void Quality_ValueChanged(object sender, EventArgs e) {