Changeset 9363 for branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators

Timestamp:

04/16/13 13:13:41 (12 years ago)

Author:

spimming

Message:

#1888:

• Merged revisions from trunk

Location:

branches/OaaS

Files:

• . (modified) (2 props)
• HeuristicLab.Problems.TestFunctions (modified) (1 prop)
• HeuristicLab.Problems.TestFunctions/3.3/Evaluators/AckleyEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BealeEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BoothEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/Evaluators/GriewankEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/Evaluators/LevyEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MatyasEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MultinormalEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RandomEvaluator.cs (copied) (copied from trunk/sources/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RandomEvaluator.cs)
• HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RastriginEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RosenbrockEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SchwefelEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs (modified) (2 diffs)
• HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SphereEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SumSquaresEvaluator.cs (modified) (1 diff)
• HeuristicLab.Problems.TestFunctions/3.3/Evaluators/ZakharovEvaluator.cs (modified) (1 diff)

branches/OaaS

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages

branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/AckleyEvaluator.cs

@@ -109 +109 @@
     /// <param name="point">N-dimensional point for which the test function should be evaluated.</param>
     /// <returns>The result value of the Ackley function at the given point.</returns>
-    protected override double EvaluateFunction(RealVector point) {
+    public override double EvaluateFunction(RealVector point) {
       return Apply(point);
     }

branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BealeEvaluator.cs

@@ -98 +98 @@
     /// <param name="point">N-dimensional point for which the test function should be evaluated.</param>
     /// <returns>The result value of the Beale function at the given point.</returns>
-    protected override double EvaluateFunction(RealVector point) {
+    public override double EvaluateFunction(RealVector point) {
       return Apply(point);
     }

branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/BoothEvaluator.cs

@@ -94 +94 @@
     /// <param name="point">N-dimensional point for which the test function should be evaluated.</param>
     /// <returns>The result value of the Booth function at the given point.</returns>
-    protected override double EvaluateFunction(RealVector point) {
+    public override double EvaluateFunction(RealVector point) {
       return Apply(point);
     }

branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/GriewankEvaluator.cs

@@ -133 +133 @@
     /// <param name="point">N-dimensional point for which the test function should be evaluated.</param>
     /// <returns>The result value of the Griewank function at the given point.</returns>
-    protected override double EvaluateFunction(RealVector point) {
+    public override double EvaluateFunction(RealVector point) {
       if (point.Length > 100)
         return Apply(point);

branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/LevyEvaluator.cs

@@ -111 +111 @@
     /// <param name="point">N-dimensional point for which the test function should be evaluated.</param>
     /// <returns>The result value of the Levy function at the given point.</returns>
-    protected override double EvaluateFunction(RealVector point) {
+    public override double EvaluateFunction(RealVector point) {
       return Apply(point);
     }

branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MatyasEvaluator.cs

@@ -93 +93 @@
     /// <param name="point">N-dimensional point for which the test function should be evaluated.</param>
     /// <returns>The result value of the Matyas function at the given point.</returns>
-    protected override double EvaluateFunction(RealVector point) {
+    public override double EvaluateFunction(RealVector point) {
       return Apply(point);
     }

branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MultinormalEvaluator.cs

@@ -44 +44 @@
       set { Parameters["s^2s"].ActualValue = value; }
     }
-    private static Random Random = new Random();
+    private static System.Random Random = new System.Random();
 
     private Dictionary<int, List<RealVector>> stdCenters;
@@ -161 +161 @@
     }
 
-    public double Evaluate(RealVector point) {
-      return EvaluateFunction(point);
-    }
-
-    protected override double EvaluateFunction(RealVector point) {
+    public override double EvaluateFunction(RealVector point) {
       double value = 0;
       if (centers.Count == 0) {

branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RastriginEvaluator.cs

@@ -119 +119 @@
     /// <param name="point">N-dimensional point for which the test function should be evaluated.</param>
     /// <returns>The result value of the Rastrigin function at the given point.</returns>
-    protected override double EvaluateFunction(RealVector point) {
+    public override double EvaluateFunction(RealVector point) {
       return Apply(point, A.Value);
     }

branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/RosenbrockEvaluator.cs

@@ -105 +105 @@
     /// <param name="point">N-dimensional point for which the test function should be evaluated.</param>
     /// <returns>The result value of the Rosenbrock function at the given point.</returns>
-    protected override double EvaluateFunction(RealVector point) {
+    public override double EvaluateFunction(RealVector point) {
       return Apply(point);
     }

branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SchwefelEvaluator.cs

@@ -96 +96 @@
     /// <param name="point">N-dimensional point for which the test function should be evaluated.</param>
     /// <returns>The result value of the Schwefel function at the given point.</returns>
-    protected override double EvaluateFunction(RealVector point) {
+    public override double EvaluateFunction(RealVector point) {
       return Apply(point);
     }

branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SingleObjectiveTestFunctionProblemEvaluator.cs

@@ -92 +92 @@
       return EvaluateFunction(new RealVector(new double[] { x, y }));
     }
-    /// <summary>
-    /// Gets the best known solution for this function.
-    /// </summary>
-    public abstract RealVector GetBestKnownSolution(int dimension);
 
     /// <summary>
@@ -102 +98 @@
     /// <param name="point">N-dimensional point for which the test function should be evaluated.</param>
     /// <returns>The result value of the function at the given point.</returns>
-    protected abstract double EvaluateFunction(RealVector point);
+    public abstract double EvaluateFunction(RealVector point);
+
+    /// <summary>
+    /// Gets the best known solution for this function.
+    /// </summary>
+    public abstract RealVector GetBestKnownSolution(int dimension);
   }
 }

branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SphereEvaluator.cs

@@ -132 +132 @@
     /// <param name="point">N-dimensional point for which the test function should be evaluated.</param>
     /// <returns>The result value of the Sphere function at the given point.</returns>
-    protected override double EvaluateFunction(RealVector point) {
+    public override double EvaluateFunction(RealVector point) {
       return Apply(point, C.Value, Alpha.Value);
     }

branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/SumSquaresEvaluator.cs

@@ -96 +96 @@
     /// <param name="point">N-dimensional point for which the test function should be evaluated.</param>
     /// <returns>The result value of the Sum Squares function at the given point.</returns>
-    protected override double EvaluateFunction(RealVector point) {
+    public override double EvaluateFunction(RealVector point) {
       return Apply(point);
     }

branches/OaaS/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/ZakharovEvaluator.cs

@@ -100 +100 @@
     /// <param name="point">N-dimensional point for which the test function should be evaluated.</param>
     /// <returns>The result value of the Zakharov function at the given point.</returns>
-    protected override double EvaluateFunction(RealVector point) {
+    public override double EvaluateFunction(RealVector point) {
       return Apply(point);
     }

@@ -21 +21 @@
 protoc.exe
 _ReSharper.HeuristicLab 3.3 Tests
+Google.ProtocolBuffers-2.4.1.473.dll
 packages