Changeset 2566 for trunk/sources/HeuristicLab.GP.StructureIdentification

Timestamp:

12/21/09 16:14:40 (15 years ago)

Author:

gkronber

Message:

Added new predefined function libraries for symbolic regression algorithms. Changed CEDMA dispatcher to choose a function library randomly. #813 (GP structure-identification algorithms that use only a simple function library)

Location:

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3

Files:

• DefaultStructureIdentificationOperators.cs (modified) (1 diff)
• FunctionLibraryInjectors (added)
• FunctionLibraryInjectors/ArithmeticFunctionLibraryInjector.cs (added)
• FunctionLibraryInjectors/DefaultFunctionLibraryInjector.cs (moved) (moved from trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/FunctionLibraryInjector.cs) (2 diffs)
• FunctionLibraryInjectors/SimpleFunctionLibraryInjector.cs (added)
• FunctionLibraryInjectors/SymbolicRegressionFunctionLibraryInjectorAttribute.cs (added)
• FunctionLibraryInjectors/UnconstrainedFunctionLibraryInjector.cs (added)
• HeuristicLab.GP.StructureIdentification-3.3.csproj (modified) (2 diffs)
• OffspringSelectionGPRegression.cs (modified) (1 diff)
• OffspringSelectionGPSimpleRegression.cs (deleted)
• StandardGPRegression.cs (modified) (1 diff)
• StandardGPSimpleRegression.cs (deleted)

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/DefaultStructureIdentificationOperators.cs

@@ -35 +35 @@
       op.Name = "FunctionLibraryInjector";
       SequentialProcessor seq = new SequentialProcessor();
-      seq.AddSubOperator(new FunctionLibraryInjector());
-      seq.AddSubOperator(new HL3TreeEvaluatorInjector());
-      op.OperatorGraph.AddOperator(seq);
-      op.OperatorGraph.InitialOperator = seq;
-      return op;
-    }
-
-    public static IOperator CreateSimpleFunctionLibraryInjector() {
-      CombinedOperator op = new CombinedOperator();
-      op.Name = "FunctionLibraryInjector";
-      SequentialProcessor seq = new SequentialProcessor();
-      var funLibInjector = new FunctionLibraryInjector();
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.CONSTANTS_ALLOWED, null, false).Data = true;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.VARIABLES_ALLOWED, null, false).Data = true;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.ADDITION_ALLOWED, null, false).Data = true;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.SUBTRACTION_ALLOWED, null, false).Data = true;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.MULTIPLICATION_ALLOWED, null, false).Data = true;
-
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.AND_ALLOWED, null, false).Data = false;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.AVERAGE_ALLOWED, null, false).Data = false;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.COSINUS_ALLOWED, null, false).Data = false;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.DIFFERENTIALS_ALLOWED, null, false).Data = false;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.DIVISION_ALLOWED, null, false).Data = false;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.EQUAL_ALLOWED, null, false).Data = false;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.EXPONENTIAL_ALLOWED, null, false).Data = false;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.GREATERTHAN_ALLOWED, null, false).Data = false;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.IFTHENELSE_ALLOWED, null, false).Data = false;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.LESSTHAN_ALLOWED, null, false).Data = false;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.LOGARTIHM_ALLOWED, null, false).Data = false;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.NOT_ALLOWED, null, false).Data = false;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.OR_ALLOWED, null, false).Data = false;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.POWER_ALLOWED, null, false).Data = false;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.SIGNUM_ALLOWED, null, false).Data = false;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.SINUS_ALLOWED, null, false).Data = false;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.SQRT_ALLOWED, null, false).Data = false;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.TANGENS_ALLOWED, null, false).Data = false;
-      funLibInjector.GetVariableValue<BoolData>(FunctionLibraryInjector.XOR_ALLOWED, null, false).Data = false;
-      seq.AddSubOperator(funLibInjector);
+      seq.AddSubOperator(new DefaultFunctionLibraryInjector());
       seq.AddSubOperator(new HL3TreeEvaluatorInjector());
       op.OperatorGraph.AddOperator(seq);

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/FunctionLibraryInjectors/DefaultFunctionLibraryInjector.cs

@@ -27 +27 @@
 
 namespace HeuristicLab.GP.StructureIdentification {
-  public class FunctionLibraryInjector : FunctionLibraryInjectorBase {
+  [SymbolicRegressionFunctionLibraryInjector]
+  public class DefaultFunctionLibraryInjector : FunctionLibraryInjectorBase {
     public const string MINTIMEOFFSET = "MinTimeOffset";
     public const string MAXTIMEOFFSET = "MaxTimeOffset";
@@ -63 +64 @@
     }
 
-    public FunctionLibraryInjector()
+    public DefaultFunctionLibraryInjector()
       : base() {
       AddVariableInfo(new VariableInfo(MINTIMEOFFSET, "Minimal time offset for all features", typeof(IntData), VariableKind.In));

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/HeuristicLab.GP.StructureIdentification-3.3.csproj

@@ -85 +85 @@
     <Compile Include="BaseClasses\FunctionTreeBase.cs" />
     <Compile Include="BaseClasses\TreeEvaluatorBase.cs" />
-    <Compile Include="OffspringSelectionGPSimpleRegression.cs" />
-    <Compile Include="StandardGPSimpleRegression.cs" />
+    <Compile Include="FunctionLibraryInjectors\ArithmeticFunctionLibraryInjector.cs" />
+    <Compile Include="FunctionLibraryInjectors\SymbolicRegressionFunctionLibraryInjectorAttribute.cs" />
+    <Compile Include="FunctionLibraryInjectors\UnconstrainedFunctionLibraryInjector.cs" />
+    <Compile Include="FunctionLibraryInjectors\DefaultFunctionLibraryInjector.cs" />
+    <Compile Include="FunctionLibraryInjectors\SimpleFunctionLibraryInjector.cs" />
     <Compile Include="DefaultStructureIdentificationOperators.cs" />
     <Compile Include="Evaluators\NodeBasedVariableImpactCalculator.cs" />
@@ -133 +136 @@
     <Compile Include="ITreeEvaluator.cs" />
     <Compile Include="Evaluators\MeanAbsolutePercentageOfRangeErrorEvaluator.cs" />
-    <Compile Include="FunctionLibraryInjector.cs" />
     <Compile Include="Evaluators\CoefficientOfDeterminationEvaluator.cs" />
     <Compile Include="Evaluators\UncertainMeanSquaredErrorEvaluator.cs" />

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/OffspringSelectionGPRegression.cs

@@ -116 +116 @@
         problemInjector.OperatorGraph.AddOperator(value);
         problemInjector.OperatorGraph.InitialOperator.AddSubOperator(value, 0);
+      }
+    }
+
+    public override IOperator FunctionLibraryInjector {
+      get {
+        CombinedOperator funLibInjector = (CombinedOperator)GetInitializationOperator().SubOperators[1];
+        return funLibInjector.OperatorGraph.InitialOperator.SubOperators[0];
+      }
+      set {
+        CombinedOperator funLibInjector = (CombinedOperator)GetInitializationOperator().SubOperators[1];
+        IOperator seq = funLibInjector.OperatorGraph.InitialOperator;
+        seq.RemoveSubOperator(0);
+        seq.AddSubOperator(value, 0);
       }
     }

trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/StandardGPRegression.cs

@@ -117 +117 @@
         problemInjector.OperatorGraph.AddOperator(value);
         problemInjector.OperatorGraph.InitialOperator.AddSubOperator(value, 0);
+      }
+    }
+
+    public override IOperator FunctionLibraryInjector {
+      get {
+        CombinedOperator funLibInjector = (CombinedOperator)GetInitializationOperator().SubOperators[1];
+        return funLibInjector.OperatorGraph.InitialOperator.SubOperators[0];
+      }
+      set {
+        CombinedOperator funLibInjector = (CombinedOperator)GetInitializationOperator().SubOperators[1];
+        IOperator seq = funLibInjector.OperatorGraph.InitialOperator;
+        seq.RemoveSubOperator(0);
+        seq.AddSubOperator(value, 0);
       }
     }