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

Timestamp:

01/01/10 19:06:18 (15 years ago)

Author:

gkronber

Message:

Remove usage of UseEstimatedTargetValue parameter. #825 (UseEstimatedTargetValue parameter should be removed from evaluation operators.)

Location:

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

Files:

• AveragePercentageChangeEvaluator.cs (modified) (2 diffs)
• OffspringSelectionGPTimeSeriesPrognosis.cs (modified) (2 diffs)
• ProfitEvaluator.cs (modified) (2 diffs)
• StandardGPTimeSeriesPrognosis.cs (modified) (2 diffs)

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

@@ -38 +38 @@
     }
 
-    public override void Evaluate(IScope scope, ITreeEvaluator evaluator, HeuristicLab.DataAnalysis.Dataset dataset, int targetVariable, int start, int end, bool updateTargetValues) {
+    public override void Evaluate(IScope scope, ITreeEvaluator evaluator, HeuristicLab.DataAnalysis.Dataset dataset, int targetVariable, int start, int end) {
       bool differential = GetVariableValue<BoolData>("Differential", scope, true).Data;
       DoubleData apc = GetVariableValue<DoubleData>("APC", scope, false, false);
@@ -55 +55 @@
           originalPercentageChange = (dataset.GetValue(sample, targetVariable) - prevOriginal) / prevOriginal;
           estimatedPercentageChange = (evaluator.Evaluate(sample) - prevOriginal) / prevOriginal;
-          if (updateTargetValues) {
-            dataset.SetValue(sample, targetVariable, estimatedPercentageChange * prevOriginal + prevOriginal);
-          }
+          
         } else {
           originalPercentageChange = dataset.GetValue(sample, targetVariable);
           estimatedPercentageChange = evaluator.Evaluate(sample);
-          if (updateTargetValues) {
-            dataset.SetValue(sample, targetVariable, estimatedPercentageChange);
-          }
+          
         }
         if (!double.IsNaN(originalPercentageChange) && !double.IsInfinity(originalPercentageChange)) {

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

@@ -45 +45 @@
     }
 
-    public bool UseEstimatedTargetValue {
-      get { return GetVariableInjector().GetVariable("UseEstimatedTargetValue").GetValue<BoolData>().Data; }
-      set { GetVariableInjector().GetVariable("UseEstimatedTargetValue").GetValue<BoolData>().Data = value; }
-    }
-
     protected override IOperator CreateProblemInjector() {
       return DefaultTimeSeriesOperators.CreateProblemInjector();
@@ -71 +66 @@
       injector.AddVariable(new HeuristicLab.Core.Variable("MinTimeOffset", new IntData()));
       injector.AddVariable(new HeuristicLab.Core.Variable("MaxTimeOffset", new IntData()));
-      injector.AddVariable(new HeuristicLab.Core.Variable("UseEstimatedTargetValue", new BoolData()));
       return injector;
     }

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

@@ -38 +38 @@
     }
 
-    public override void Evaluate(IScope scope, ITreeEvaluator evaluator, HeuristicLab.DataAnalysis.Dataset dataset, int targetVariable, int start, int end, bool updateTargetValues) {
+    public override void Evaluate(IScope scope, ITreeEvaluator evaluator, HeuristicLab.DataAnalysis.Dataset dataset, int targetVariable, int start, int end) {
       int exchangeRateVarIndex = GetVariableValue<IntData>("ExchangeRate", scope, true).Data;
       double transactionCost = GetVariableValue<DoubleData>("TransactionCost", scope, true).Data;
@@ -54 +54 @@
         double originalPercentageChange = dataset.GetValue(sample, targetVariable);
         double estimatedPercentageChange = evaluator.Evaluate(sample);
-        if (updateTargetValues) {
-          dataset.SetValue(sample, targetVariable, estimatedPercentageChange);
-        }
+        
         if (!double.IsNaN(originalPercentageChange) && !double.IsInfinity(originalPercentageChange)) {
           if (estimatedPercentageChange > 0) {

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

@@ -45 +45 @@
     }
 
-    public bool UseEstimatedTargetValue {
-      get { return GetVariableInjector().GetVariable("UseEstimatedTargetValue").GetValue<BoolData>().Data; }
-      set { GetVariableInjector().GetVariable("UseEstimatedTargetValue").GetValue<BoolData>().Data = value; }
-    }
-
     protected override IOperator CreateProblemInjector() {
       return DefaultTimeSeriesOperators.CreateProblemInjector();
@@ -75 +70 @@
       injector.AddVariable(new HeuristicLab.Core.Variable("MinTimeOffset", new IntData()));
       injector.AddVariable(new HeuristicLab.Core.Variable("MaxTimeOffset", new IntData()));
-      injector.AddVariable(new HeuristicLab.Core.Variable("UseEstimatedTargetValue", new BoolData()));
       return injector;
     }