Changeset 2577 for trunk/sources/HeuristicLab.GP.StructureIdentification.ConditionalEvaluation/3.3

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.ConditionalEvaluation/3.3

Files:

• ConditionalEvaluatorBase.cs (modified) (2 diffs)
• ConditionalSimpleEvaluator.cs (modified) (2 diffs)

trunk/sources/HeuristicLab.GP.StructureIdentification.ConditionalEvaluation/3.3/ConditionalEvaluatorBase.cs

@@ -40 +40 @@
     }
 
-    public override void Evaluate(IScope scope, ITreeEvaluator evaluator, Dataset dataset, int targetVariable, int start, int end, bool updateTargetValues) {
+    public override void Evaluate(IScope scope, ITreeEvaluator evaluator, Dataset dataset, int targetVariable, int start, int end) {
       int maxTimeOffset = GetVariableValue<IntData>("MaxTimeOffset", scope, true).Data;
       int minTimeOffset = GetVariableValue<IntData>("MinTimeOffset", scope, true).Data;
@@ -60 +60 @@
           double original = dataset.GetValue(sample, targetVariable);
           double estimated = evaluator.Evaluate(sample);
-          if (updateTargetValues) {
-            dataset.SetValue(sample, targetVariable, estimated);
-          }
+          
           values[sample - start - skippedSampels, 0] = estimated;
           values[sample - start - skippedSampels, 1] = original;
         }
       }
-      //needed because otherwise the array is too larged dimension and therefore the sample count is false during calculation
+      //needed because otherwise the array is too large and therefore the sample count is incorrect during calculation
       ResizeArray(ref values, 2, end - start - skippedSampels);
 

trunk/sources/HeuristicLab.GP.StructureIdentification.ConditionalEvaluation/3.3/ConditionalSimpleEvaluator.cs

@@ -38 +38 @@
     }
 
-    public override void Evaluate(IScope scope, ITreeEvaluator evaluator, Dataset dataset, int targetVariable, int start, int end, bool updateTargetValues) {
+    public override void Evaluate(IScope scope, ITreeEvaluator evaluator, Dataset dataset, int targetVariable, int start, int end) {
       ItemList values = GetVariableValue<ItemList>("Values", scope, false, false);
       if (values == null) {
@@ -68 +68 @@
           double estimated = evaluator.Evaluate(sample);
           double original = dataset.GetValue(sample, targetVariable);
-          if (updateTargetValues) {
-            dataset.SetValue(sample, targetVariable, estimated);
-          }
+         
           row.Add(new DoubleData(estimated));
           row.Add(new DoubleData(original));