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

Timestamp:

01/22/10 16:12:26 (14 years ago)

Author:

gkronber

Message:

Implemented a fix in TreeGardener for #836 (Initial population doesn't contain all functions in combination with SimpleFunctionLibraryInjector). Added test cases for SimpleFunctionLibraryInjector. Changed code for calculation of minTreeHeight and minTreeSize in FunctionBase

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification/3.3/FunctionLibraryInjectors/SimpleFunctionLibraryInjector.cs (modified) (4 diffs)

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

@@ -67 +67 @@
 
     protected override FunctionLibrary CreateFunctionLibrary() {
+      return Create(
+        GetVariableValue<BoolData>(DIFFERENTIALS_ALLOWED, null, false).Data,
+        minTimeOffset,
+        maxTimeOffset);
+    }
+
+    public static FunctionLibrary Create(bool differentialAllowed, int minTimeOffset, int maxTimeOffset) {
       FunctionLibrary functionLibrary = new FunctionLibrary();
 
@@ -85 +92 @@
 
       List<IFunction> valueNodes = new List<IFunction>();
-      ConditionalAddFunction(DIFFERENTIALS_ALLOWED, differential, valueNodes);
+      if (differentialAllowed) valueNodes.Add(differential);
       valueNodes.Add(variable);
       valueNodes.Add(constant);
@@ -122 +129 @@
       SetAllowedSubOperators(tangens, valueNodes);
 
-      ConditionalAddOperator(DIFFERENTIALS_ALLOWED, functionLibrary, differential);
+      if (differentialAllowed) functionLibrary.AddFunction(differential);
 
       allFunctions.ForEach(x => functionLibrary.AddFunction(x));
@@ -131 +138 @@
       return functionLibrary;
     }
-
-    private void ConditionalAddFunction(string condName, IFunction fun, List<IFunction> list) {
-      if (GetVariableValue<BoolData>(condName, null, false).Data) list.Add(fun);
-    }
-
-    private void ConditionalAddOperator(string condName, FunctionLibrary functionLib, IFunction op) {
-      if (GetVariableValue<BoolData>(condName, null, false).Data) functionLib.AddFunction(op);
-    }
   }
 }