Changeset 13403 for branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Functions/Multinormal.cs

Timestamp:

11/25/15 23:24:01 (9 years ago)

Author:

abeham

Message:

#2521:

• Adapted single-objective test function problem to new problem infrastructure
• Added additional interfaces to RealVectorEncoding
• Fixed IParticleUpdater interface (must implement IStochasticOperator if it contains a Random parameter)

Location:

branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Functions

Files:

• . (moved) (moved from branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Evaluators)
• Multinormal.cs (copied) (copied from branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Evaluators/MultinormalEvaluator.cs) (4 diffs)

branches/ProblemRefactoring/HeuristicLab.Problems.TestFunctions/3.3/Functions/Multinormal.cs

@@ -30 +30 @@
 using HeuristicLab.Parameters;
 using HeuristicLab.Persistence.Default.CompositeSerializers.Storable;
+using HeuristicLab.Random;
 
 namespace HeuristicLab.Problems.TestFunctions.Evaluators {
-  [Item("MultinormalFunction", "Evaluates a random multinormal function on a given point.")]
+  [Item("Multinormal", "Evaluates a random multinormal function on a given point.")]
   [StorableClass]
-  public class MultinormalEvaluator : SingleObjectiveTestFunctionProblemEvaluator {
-    public override string FunctionName { get { return "Multinormal"; } }
+  public class Multinormal : SingleObjectiveTestFunction {
 
     private ItemList<RealVector> centers {
@@ -45 +45 @@
       set { Parameters["s^2s"].ActualValue = value; }
     }
-    private static System.Random Random = new System.Random();
+
+    public IRandom Random {
+      get { return ((ValueParameter<IRandom>)Parameters["Random"]).Value; }
+      set { ((ValueParameter<IRandom>)Parameters["Random"]).Value = value; }
+    }
 
     private Dictionary<int, List<RealVector>> stdCenters;
@@ -87 +91 @@
 
     [StorableConstructor]
-    protected MultinormalEvaluator(bool deserializing) : base(deserializing) { }
-    protected MultinormalEvaluator(MultinormalEvaluator original, Cloner cloner) : base(original, cloner) { }
-    public MultinormalEvaluator() {
+    protected Multinormal(bool deserializing) : base(deserializing) { }
+    protected Multinormal(Multinormal original, Cloner cloner) : base(original, cloner) { }
+    public Multinormal() {
       Parameters.Add(new ValueParameter<ItemList<RealVector>>("Centers", "Centers of normal distributions"));
       Parameters.Add(new ValueParameter<RealVector>("s^2s", "sigma^2 of normal distributions"));
-      Parameters.Add(new LookupParameter<IRandom>("Random", "Random number generator"));
+      Parameters.Add(new ValueParameter<IRandom>("Random", "The random number generator that will make random instances", new MersenneTwister(0)));
       centers = new ItemList<RealVector>();
       s_2s = new RealVector();
@@ -98 +102 @@
 
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new MultinormalEvaluator(this, cloner);
+      return new Multinormal(this, cloner);
     }