Changeset 2821 for trunk/sources/HeuristicLab.GP.StructureIdentification.Networks

Timestamp:

02/17/10 19:22:45 (15 years ago)

Author:

gkronber

Message:

Removed access to local variable DIFFERENTIALS_ALLOWED in time series prognosis engines. #877 (Predefined GP engines for time series prognosis are defect because of the removal of local variables of function library injectors in #748)

File:

• trunk/sources/HeuristicLab.GP.StructureIdentification.Networks/3.2/FunctionLibraryInjector.cs (modified) (3 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification.Networks/3.2/FunctionLibraryInjector.cs

@@ -66 +66 @@
 
     protected override FunctionLibrary CreateFunctionLibrary() {
-      return Create(GetVariableValue<BoolData>(DIFFERENTIALS_ALLOWED, null, false).Data, minTimeOffset, maxTimeOffset);
+      return Create(minTimeOffset, maxTimeOffset);
     }
 
-    public static FunctionLibrary Create(bool includeDifferential, int minTimeOffset, int maxTimeOffset) {
+    public static FunctionLibrary Create(int minTimeOffset, int maxTimeOffset) {
       FunctionLibrary functionLibrary = new FunctionLibrary();
 
@@ -83 +83 @@
       List<IFunction> f0Functions =
         new List<IFunction>() { 
-          variable, constant, addition, subtraction,
+          differential, variable, constant, addition, subtraction,
           division, multiplication};
 
-      if (includeDifferential)
-        f0Functions.Add(differential);
+
       #endregion
 
@@ -144 +143 @@
       SetAllowedSubOperators(openSub, f1Functions);
 
-      if (includeDifferential)
-        functionLibrary.AddFunction(differential);
       f0Functions.ForEach(x => functionLibrary.AddFunction(x));
       f1Functions.ForEach(x => functionLibrary.AddFunction(x));