Changeset 2821

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)

Location:

trunk/sources

Files:

• HeuristicLab.GP.StructureIdentification.Networks/3.2/FunctionLibraryInjector.cs (modified) (3 diffs)
• HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/OffspringSelectionGPTimeSeriesPrognosis.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/StandardGPTimeSeriesPrognosis.cs (modified) (1 diff)
• HeuristicLab.GP.StructureIdentification/3.3/FunctionLibraryInjectors/DefaultFunctionLibraryInjector.cs (modified) (1 diff)

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));

trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/OffspringSelectionGPTimeSeriesPrognosis.cs

@@ -54 +54 @@
       SequentialProcessor seq = new SequentialProcessor();
       DefaultFunctionLibraryInjector funLibInjector = new DefaultFunctionLibraryInjector();
-      funLibInjector.GetVariable("Differentials").Value = new BoolData(true);
       seq.AddSubOperator(funLibInjector);
       seq.AddSubOperator(new ScalingTreeEvaluatorInjector());

trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries/3.3/StandardGPTimeSeriesPrognosis.cs

@@ -54 +54 @@
       SequentialProcessor seq = new SequentialProcessor();
       DefaultFunctionLibraryInjector funLibInjector = new DefaultFunctionLibraryInjector();
-      funLibInjector.GetVariable("Differentials").Value = new BoolData(true);
       seq.AddSubOperator(funLibInjector);
       seq.AddSubOperator(new ScalingTreeEvaluatorInjector());

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

@@ -126 +126 @@
       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);
-    }
   }
 }