Changeset 13652 for trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/MctsSymbolicRegressionAlgorithm.cs

Timestamp:

03/05/16 19:41:24 (8 years ago)

Author:

gkronber

Message:

#2581:

• removed simplification of trees (temporarily for better debugging)
• renamed MaxSize parameter
• fixed a small bug in MCTS
• changed SymbolicExpressionGenerator to produce trees in the correct order

File:

• trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/MctsSymbolicRegressionAlgorithm.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.Algorithms.DataAnalysis/3.4/MctsSymbolicRegression/MctsSymbolicRegressionAlgorithm.cs

@@ -70 +70 @@
       get { return (IFixedValueParameter<IntValue>)Parameters[IterationsParameterName]; }
     }
-    public IFixedValueParameter<IntValue> MaxSizeParameter {
+    public IFixedValueParameter<IntValue> MaxVariableReferencesParameter {
       get { return (IFixedValueParameter<IntValue>)Parameters[MaxVariablesParameterName]; }
     }
@@ -115 +115 @@
       set { SetSeedRandomlyParameter.Value.Value = value; }
     }
-    public int MaxSize {
-      get { return MaxSizeParameter.Value.Value; }
-      set { MaxSizeParameter.Value.Value = value; }
+    public int MaxVariableReferences {
+      get { return MaxVariableReferencesParameter.Value.Value; }
+      set { MaxVariableReferencesParameter.Value.Value = value; }
     }
     public double C {
@@ -244 +244 @@
       var problemData = (IRegressionProblemData)Problem.ProblemData.Clone();
       if (!AllowedFactors.CheckedItems.Any()) throw new ArgumentException("At least on type of factor must be allowed");
-      var state = MctsSymbolicRegressionStatic.CreateState(problemData, (uint)Seed, MaxSize, C, ScaleVariables, ConstantOptimizationIterations,
+      var state = MctsSymbolicRegressionStatic.CreateState(problemData, (uint)Seed, MaxVariableReferences, C, ScaleVariables, ConstantOptimizationIterations,
         lowerLimit, upperLimit,
         allowProdOfVars: AllowedFactors.CheckedItems.Any(s => s.Value.Value == VariableProductFactorName),