Changeset 10226

Timestamp:

12/14/13 17:38:57 (11 years ago)

Author:

sawinkle

Message:

#2109:

• Added file IGESymbolicDataAnalysisProblem.cs to determine, which parameters should be used. => Removed parameters MaximumSymbolicExpressionTreeDepthParameter, MaximumFunctionDefinitionsParameter and MaximumFunctionArgumentsParameter, which are unnecessary for Grammatical Evolution.
• Adapted the other files to use the interfaces of the new file IGESymbolicDataAnalysisProblem.cs

Location:

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Symbolic

Files:

• GESymbolicDataAnalysisProblem.cs (modified) (9 diffs)
• GESymbolicDataAnalysisSingleObjectiveProblem.cs (modified) (1 diff)
• GESymbolicRegressionSingleObjectiveProblem.cs (modified) (2 diffs)
• IGESymbolicDataAnalysisProblem.cs (added)

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Symbolic/GESymbolicDataAnalysisProblem.cs

@@ -40 +40 @@
 namespace HeuristicLab.Problems.GrammaticalEvolution {
   [StorableClass]
-  // TODO: ISymbolicDataAnalysisProblem -> IGESymbolicDataAnalysisProblem
   public abstract class GESymbolicDataAnalysisProblem<T, U, V> : HeuristicOptimizationProblem<U, V>, IDataAnalysisProblem<T>,
-                                                                 ISymbolicDataAnalysisProblem, IStorableContent,
+                                                                 IGESymbolicDataAnalysisProblem, IStorableContent,
                                                                  IProblemInstanceConsumer<T>, IProblemInstanceExporter<T>
     where T : class, IDataAnalysisProblemData
@@ -52 +51 @@
     private const string SymbolicExpressionTreeGrammarParameterName = "SymbolicExpressionTreeGrammar";
     private const string SymbolicExpressionTreeInterpreterParameterName = "SymbolicExpressionTreeInterpreter";
-    private const string MaximumSymbolicExpressionTreeDepthParameterName = "MaximumSymbolicExpressionTreeDepth";
+    //private const string MaximumSymbolicExpressionTreeDepthParameterName = "MaximumSymbolicExpressionTreeDepth";
     private const string MaximumSymbolicExpressionTreeLengthParameterName = "MaximumSymbolicExpressionTreeLength";
-    private const string MaximumFunctionDefinitionsParameterName = "MaximumFunctionDefinitions";
-    private const string MaximumFunctionArgumentsParameterName = "MaximumFunctionArguments";
+    //private const string MaximumFunctionDefinitionsParameterName = "MaximumFunctionDefinitions";
+    //private const string MaximumFunctionArgumentsParameterName = "MaximumFunctionArguments";
     private const string RelativeNumberOfEvaluatedSamplesParameterName = "RelativeNumberOfEvaluatedSamples";
     private const string FitnessCalculationPartitionParameterName = "FitnessCalculationPartition";
@@ -91 +90 @@
       get { return (IValueParameter<ISymbolicDataAnalysisExpressionTreeInterpreter>)Parameters[SymbolicExpressionTreeInterpreterParameterName]; }
     }
-    public IFixedValueParameter<IntValue> MaximumSymbolicExpressionTreeDepthParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[MaximumSymbolicExpressionTreeDepthParameterName]; }
-    }
+    //public IFixedValueParameter<IntValue> MaximumSymbolicExpressionTreeDepthParameter {
+    //  get { return (IFixedValueParameter<IntValue>)Parameters[MaximumSymbolicExpressionTreeDepthParameterName]; }
+    //}
     public IFixedValueParameter<IntValue> MaximumSymbolicExpressionTreeLengthParameter {
       get { return (IFixedValueParameter<IntValue>)Parameters[MaximumSymbolicExpressionTreeLengthParameterName]; }
     }
-    public IFixedValueParameter<IntValue> MaximumFunctionDefinitionsParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[MaximumFunctionDefinitionsParameterName]; }
-    }
-    public IFixedValueParameter<IntValue> MaximumFunctionArgumentsParameter {
-      get { return (IFixedValueParameter<IntValue>)Parameters[MaximumFunctionArgumentsParameterName]; }
-    }
+    //public IFixedValueParameter<IntValue> MaximumFunctionDefinitionsParameter {
+    //  get { return (IFixedValueParameter<IntValue>)Parameters[MaximumFunctionDefinitionsParameterName]; }
+    //}
+    //public IFixedValueParameter<IntValue> MaximumFunctionArgumentsParameter {
+    //  get { return (IFixedValueParameter<IntValue>)Parameters[MaximumFunctionArgumentsParameterName]; }
+    //}
     public IFixedValueParameter<PercentValue> RelativeNumberOfEvaluatedSamplesParameter {
       get { return (IFixedValueParameter<PercentValue>)Parameters[RelativeNumberOfEvaluatedSamplesParameterName]; }
@@ -144 +143 @@
     }
 
-    public IntValue MaximumSymbolicExpressionTreeDepth {
-      get { return MaximumSymbolicExpressionTreeDepthParameter.Value; }
-    }
+    //public IntValue MaximumSymbolicExpressionTreeDepth {
+    //  get { return MaximumSymbolicExpressionTreeDepthParameter.Value; }
+    //}
     public IntValue MaximumSymbolicExpressionTreeLength {
       get { return MaximumSymbolicExpressionTreeLengthParameter.Value; }
     }
-    public IntValue MaximumFunctionDefinitions {
-      get { return MaximumFunctionDefinitionsParameter.Value; }
-    }
-    public IntValue MaximumFunctionArguments {
-      get { return MaximumFunctionArgumentsParameter.Value; }
-    }
+    //public IntValue MaximumFunctionDefinitions {
+    //  get { return MaximumFunctionDefinitionsParameter.Value; }
+    //}
+    //public IntValue MaximumFunctionArguments {
+    //  get { return MaximumFunctionArgumentsParameter.Value; }
+    //}
     public PercentValue RelativeNumberOfEvaluatedSamples {
       get { return RelativeNumberOfEvaluatedSamplesParameter.Value; }
@@ -197 +196 @@
       Parameters.Add(new ValueParameter<ISymbolicDataAnalysisGrammar>(SymbolicExpressionTreeGrammarParameterName, SymbolicExpressionTreeGrammarParameterDescription));
       Parameters.Add(new ValueParameter<ISymbolicDataAnalysisExpressionTreeInterpreter>(SymbolicExpressionTreeInterpreterParameterName, SymoblicExpressionTreeInterpreterParameterDescription));
-      Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeDepthParameterName, MaximumSymbolicExpressionTreeDepthParameterDescription));
+      //Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeDepthParameterName, MaximumSymbolicExpressionTreeDepthParameterDescription));
       Parameters.Add(new FixedValueParameter<IntValue>(MaximumSymbolicExpressionTreeLengthParameterName, MaximumSymbolicExpressionTreeLengthParameterDescription));
-      Parameters.Add(new FixedValueParameter<IntValue>(MaximumFunctionDefinitionsParameterName, MaximumFunctionDefinitionsParameterDescription));
-      Parameters.Add(new FixedValueParameter<IntValue>(MaximumFunctionArgumentsParameterName, MaximumFunctionArgumentsParameterDescription));
+      //Parameters.Add(new FixedValueParameter<IntValue>(MaximumFunctionDefinitionsParameterName, MaximumFunctionDefinitionsParameterDescription));
+      //Parameters.Add(new FixedValueParameter<IntValue>(MaximumFunctionArgumentsParameterName, MaximumFunctionArgumentsParameterDescription));
       Parameters.Add(new FixedValueParameter<IntRange>(FitnessCalculationPartitionParameterName, FitnessCalculationPartitionParameterDescription));
       Parameters.Add(new FixedValueParameter<IntRange>(ValidationPartitionParameterName, ValidationPartitionParameterDescription));
@@ -210 +209 @@
 
       SymbolicExpressionTreeInterpreterParameter.Hidden = true;
-      MaximumFunctionArgumentsParameter.Hidden = true;
-      MaximumFunctionDefinitionsParameter.Hidden = true;
+      //MaximumFunctionArgumentsParameter.Hidden = true;
+      //MaximumFunctionDefinitionsParameter.Hidden = true;
       ApplyLinearScalingParameter.Hidden = true;
 
@@ -227 +226 @@
 
     protected virtual void UpdateGrammar() {
-      SymbolicExpressionTreeGrammar.MaximumFunctionArguments = MaximumFunctionArguments.Value;
-      SymbolicExpressionTreeGrammar.MaximumFunctionDefinitions = MaximumFunctionDefinitions.Value;
+      //SymbolicExpressionTreeGrammar.MaximumFunctionArguments = MaximumFunctionArguments.Value;
+      //SymbolicExpressionTreeGrammar.MaximumFunctionDefinitions = MaximumFunctionDefinitions.Value;
       foreach (var varSymbol in SymbolicExpressionTreeGrammar.Symbols.OfType<HeuristicLab.Problems.DataAnalysis.Symbolic.Variable>()) {
         if (!varSymbol.Fixed) {
@@ -260 +259 @@
       SymbolicExpressionTreeGrammarParameter.ValueChanged += new EventHandler(SymbolicExpressionTreeGrammarParameter_ValueChanged);
 
-      MaximumFunctionArguments.ValueChanged += new EventHandler(ArchitectureParameterValue_ValueChanged);
-      MaximumFunctionDefinitions.ValueChanged += new EventHandler(ArchitectureParameterValue_ValueChanged);
-      MaximumSymbolicExpressionTreeDepth.ValueChanged += new EventHandler(MaximumSymbolicExpressionTreeDepth_ValueChanged);
+      //MaximumFunctionArguments.ValueChanged += new EventHandler(ArchitectureParameterValue_ValueChanged);
+      //MaximumFunctionDefinitions.ValueChanged += new EventHandler(ArchitectureParameterValue_ValueChanged);
+      //MaximumSymbolicExpressionTreeDepth.ValueChanged += new EventHandler(MaximumSymbolicExpressionTreeDepth_ValueChanged);
     }
 
@@ -280 +279 @@
     }
 
-    private void MaximumSymbolicExpressionTreeDepth_ValueChanged(object sender, EventArgs e) {
-      if (MaximumSymbolicExpressionTreeDepth != null && MaximumSymbolicExpressionTreeDepth.Value < 3)
-        MaximumSymbolicExpressionTreeDepth.Value = 3;
-    }
-
-    /*
-    protected override void OnSolutionCreatorChanged() {
-      base.OnSolutionCreatorChanged();
-      ParameterizeOperators();
-    }
-    */
+    //private void MaximumSymbolicExpressionTreeDepth_ValueChanged(object sender, EventArgs e) {
+    //  if (MaximumSymbolicExpressionTreeDepth != null && MaximumSymbolicExpressionTreeDepth.Value < 3)
+    //    MaximumSymbolicExpressionTreeDepth.Value = 3;
+    //}
+
+    //protected override void OnSolutionCreatorChanged() {
+    //  base.OnSolutionCreatorChanged();
+    //  ParameterizeOperators();
+    //}
 
     protected override void OnEvaluatorChanged() {

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Symbolic/GESymbolicDataAnalysisSingleObjectiveProblem.cs

@@ -35 +35 @@
   [StorableClass]
   public abstract class GESymbolicDataAnalysisSingleObjectiveProblem<T, U, V> : GESymbolicDataAnalysisProblem<T, U, V>,
-                                                                                ISymbolicDataAnalysisSingleObjectiveProblem
+                                                                                IGESymbolicDataAnalysisSingleObjectiveProblem
     where T : class, IDataAnalysisProblemData
     where U : class, IGESymbolicDataAnalysisSingleObjectiveEvaluator<T>

branches/GrammaticalEvolution/HeuristicLab.Problems.GrammaticalEvolution/Symbolic/GESymbolicRegressionSingleObjectiveProblem.cs

@@ -37 +37 @@
                                                             IRegressionProblem {
     private const double PunishmentFactor = 10;
-    private const int InitialMaximumTreeDepth = 8;
+    //private const int InitialMaximumTreeDepth = 8;
     private const int InitialMaximumTreeLength = 25;
     private const string EstimationLimitsParameterName = "EstimationLimits";
@@ -69 +69 @@
       ApplyLinearScalingParameter.Value.Value = true;
       Maximization.Value = true;
-      MaximumSymbolicExpressionTreeDepth.Value = InitialMaximumTreeDepth;
+      //MaximumSymbolicExpressionTreeDepth.Value = InitialMaximumTreeDepth;
       MaximumSymbolicExpressionTreeLength.Value = InitialMaximumTreeLength;