Changeset 2843 for trunk/sources/HeuristicLab.GP.StructureIdentification.TimeSeries

Timestamp:

02/19/10 18:49:17 (15 years ago)

Author:

gkronber

Message:

Removed max. and min. time offset constraints as algorithm parameters and from all engines. The time constraints were added to the relevant terminal symbols (variable & differential) instead. The time offset constraint can be changed by editing the symbols in the function library. #880 (Max and min time offsets for variable symbols are not set correctly by FunctionLibraryInjectors)

Location:

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

Files:

• OffspringSelectionGPTimeSeriesPrognosis.cs (modified) (1 diff)
• StandardGPTimeSeriesPrognosis.cs (modified) (1 diff)

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

@@ -35 +35 @@
     }
 
-    public int MinTimeOffset {
-      get { return GetVariableInjector().GetVariable("MinTimeOffset").GetValue<IntData>().Data; }
-      set { GetVariableInjector().GetVariable("MinTimeOffset").GetValue<IntData>().Data = value; }
-    }
-
-    public int MaxTimeOffset {
-      get { return GetVariableInjector().GetVariable("MaxTimeOffset").GetValue<IntData>().Data; }
-      set { GetVariableInjector().GetVariable("MaxTimeOffset").GetValue<IntData>().Data = value; }
-    }
-
     protected override IOperator CreateProblemInjector() {
       return DefaultTimeSeriesOperators.CreateProblemInjector();
-    }
-
-    protected override IOperator CreateFunctionLibraryInjector() {
-      CombinedOperator op = new CombinedOperator();
-      op.Name = "FunctionLibraryInjector";
-      SequentialProcessor seq = new SequentialProcessor();
-      DefaultFunctionLibraryInjector funLibInjector = new DefaultFunctionLibraryInjector();
-      seq.AddSubOperator(funLibInjector);
-      seq.AddSubOperator(new ScalingTreeEvaluatorInjector());
-      op.OperatorGraph.AddOperator(seq);
-      op.OperatorGraph.InitialOperator = seq;
-      return op;
-    }
-
-    protected override VariableInjector CreateGlobalInjector() {
-      VariableInjector injector = base.CreateGlobalInjector();
-      injector.AddVariable(new HeuristicLab.Core.Variable("MinTimeOffset", new IntData()));
-      injector.AddVariable(new HeuristicLab.Core.Variable("MaxTimeOffset", new IntData()));
-      return injector;
     }
 

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

@@ -35 +35 @@
     }
 
-    public int MinTimeOffset {
-      get { return GetVariableInjector().GetVariable("MinTimeOffset").GetValue<IntData>().Data; }
-      set { GetVariableInjector().GetVariable("MinTimeOffset").GetValue<IntData>().Data = value; }
-    }
-
-    public int MaxTimeOffset {
-      get { return GetVariableInjector().GetVariable("MaxTimeOffset").GetValue<IntData>().Data; }
-      set { GetVariableInjector().GetVariable("MaxTimeOffset").GetValue<IntData>().Data = value; }
-    }
-
     protected override IOperator CreateProblemInjector() {
       return DefaultTimeSeriesOperators.CreateProblemInjector();
     }
 
-    protected override IOperator CreateFunctionLibraryInjector() {
-      CombinedOperator op = new CombinedOperator();
-      op.Name = "FunctionLibraryInjector";
-      SequentialProcessor seq = new SequentialProcessor();
-      DefaultFunctionLibraryInjector funLibInjector = new DefaultFunctionLibraryInjector();
-      seq.AddSubOperator(funLibInjector);
-      seq.AddSubOperator(new ScalingTreeEvaluatorInjector());
-      op.OperatorGraph.AddOperator(seq);
-      op.OperatorGraph.InitialOperator = seq;
-      return op;
-    }
-
     protected override IOperator CreateModelAnalyzerOperator() {
       return DefaultTimeSeriesOperators.CreatePostProcessingOperator();
-    }
-
-    protected override VariableInjector CreateGlobalInjector() {
-      VariableInjector injector = base.CreateGlobalInjector();
-      injector.AddVariable(new HeuristicLab.Core.Variable("MinTimeOffset", new IntData()));
-      injector.AddVariable(new HeuristicLab.Core.Variable("MaxTimeOffset", new IntData()));
-      return injector;
     }