Changeset 10177 for branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/RandomSamplesEvaluator .cs

Timestamp:

12/03/13 14:52:41 (10 years ago)

Author:

mkommend

Message:

#1997: Added different evaluators for symbolic island algorithms, unit test for consecutive samples evaluator and injected island index into the according scopes.

Location:

branches/DataAnalysis.IslandAlgorithms

Files:

• . (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3 (modified) (1 prop)
• HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/RandomSamplesEvaluator .cs (moved) (moved from branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/SymbolicDataAnalysisIslandGAEvaluator.cs) (4 diffs)

branches/DataAnalysis.IslandAlgorithms

@@ -1 +1 @@
 *.suo
+bin

@@ -1 +1 @@
 *.suo
+bin

branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3

@@ +1 @@
+*.user
 Plugin.cs
 bin

@@ +1 @@
+*.user
 Plugin.cs
 bin

branches/DataAnalysis.IslandAlgorithms/HeuristicLab.Algorithms.DataAnalysis.Symbolic/3.3/RandomSamplesEvaluator .cs

@@ -34 +34 @@
 namespace HeuristicLab.Algorithms.DataAnalysis.Symbolic {
   [StorableClass]
-  public sealed class SymbolicDataAnalysisIslandGAEvaluator : SingleSuccessorOperator, IStochasticOperator, ISymbolicDataAnalysisIslandGAEvaluator {
+  public sealed class RandomSamplesEvaluator : SingleSuccessorOperator, IStochasticOperator, ISymbolicDataAnalysisIslandGeneticAlgorithmEvaluator {
     private const string RandomParameterName = "Random";
     private const string ProblemDataParameterName = "ProblemData";
@@ -56 +56 @@
       get { return (ILookupParameter<DoubleValue>)Parameters[QualityParameterName]; }
     }
-    public IValueLookupParameter<IntRange> FitnessCalculationPartitionParameter {
-      get { return (IValueLookupParameter<IntRange>)Parameters[FitnessCalculationPartitionParameterName]; }
+    public ILookupParameter<IntRange> FitnessCalculationPartitionParameter {
+      get { return (ILookupParameter<IntRange>)Parameters[FitnessCalculationPartitionParameterName]; }
     }
     public ILookupParameter<IntRange> FixedSamplesPartitionParameter {
       get { return (ILookupParameter<IntRange>)Parameters[FixedSamplesPartitionParameterName]; }
     }
-    public ILookupParameter<IntValue> RandomSamplesParameter {
-      get { return (ILookupParameter<IntValue>)Parameters[RandomSamplesParameterName]; }
+    public IFixedValueParameter<IntValue> RandomSamplesParameter {
+      get { return (IFixedValueParameter<IntValue>)Parameters[RandomSamplesParameterName]; }
+    }
+    #endregion
+
+    #region properties
+
+    public int RandomSamples {
+      get { return RandomSamplesParameter.Value.Value; }
+      set { RandomSamplesParameter.Value.Value = value; }
     }
     #endregion
 
     [StorableConstructor]
-    private SymbolicDataAnalysisIslandGAEvaluator(bool deserializing) : base(deserializing) { }
-    private SymbolicDataAnalysisIslandGAEvaluator(SymbolicDataAnalysisIslandGAEvaluator original, Cloner cloner)
+    private RandomSamplesEvaluator(bool deserializing) : base(deserializing) { }
+    private RandomSamplesEvaluator(RandomSamplesEvaluator original, Cloner cloner)
       : base(original, cloner) {
     }
     public override IDeepCloneable Clone(Cloner cloner) {
-      return new SymbolicDataAnalysisIslandGAEvaluator(this, cloner);
+      return new RandomSamplesEvaluator(this, cloner);
     }
 
-    public SymbolicDataAnalysisIslandGAEvaluator()
+    public RandomSamplesEvaluator()
       : base() {
       Parameters.Add(new LookupParameter<IRandom>(RandomParameterName, "The random generator to use."));
@@ -82 +90 @@
       Parameters.Add(new LookupParameter<IOperator>(EvaluatorParameterName, "The evaluator provided by the symbolic data analysis  problem."));
       Parameters.Add(new LookupParameter<DoubleValue>(QualityParameterName, "The quality which is calculated by the encapsulated evaluator."));
-      Parameters.Add(new ValueLookupParameter<IntRange>(FitnessCalculationPartitionParameterName, "The data partition used to calculate the fitness"));
+      Parameters.Add(new LookupParameter<IntRange>(FitnessCalculationPartitionParameterName, "The data partition used to calculate the fitness"));
       Parameters.Add(new LookupParameter<IntRange>(FixedSamplesPartitionParameterName, "The data partition which is used to calculate the fitness on the fixed samples."));
-      Parameters.Add(new LookupParameter<IntValue>(RandomSamplesParameterName, "The number of random samples used for fitness calculation in each island."));
-
-      EvaluatorParameter.Hidden = true;
+      Parameters.Add(new FixedValueParameter<IntValue>(RandomSamplesParameterName, "The number of random samples used for fitness calculation in each island.", new IntValue()));
     }
 
@@ -95 +101 @@
       var samples = FitnessCalculationPartitionParameter.ActualValue;
       var fixedSamples = FixedSamplesPartitionParameter.ActualValue;
-      var randomSamples = RandomSamplesParameter.ActualValue.Value;
+      var randomSamples = RandomSamples;
 
       //create fixed rows enumerable

@@ -1 +1 @@
 *.suo
+bin

@@ +1 @@
+*.user
 Plugin.cs
 bin