Context Navigation

Evaluation

Timestamp:

08/10/08 11:37:05 (16 years ago)

Author:

gkronber

Message:

fixed a bug (ticket #242 (All GP evaluators should support the 'UseEstimatedTargetValues' switch for autoregressive modelling))

Location:

Files:

r479	r480
65	65	double est = GetEstimatedValue(sample);
66	66	double origClass = GetOriginalValue(sample);
	67	SetOriginalValue(sample, est);
67	68	double estClass = double.NaN;
68	69	// if estimation is lower than the smallest threshold value -> estimated class is the lower class

r479	r480
60	60	double estimated = GetEstimatedValue(sample);
61	61	double original = GetOriginalValue(sample);
	62	SetOriginalValue(sample, estimated);
62	63	if(!double.IsNaN(original) && !double.IsInfinity(original)) {
63	64	double error = estimated - original;

r479	r480
49	49	double estimated = GetEstimatedValue(sample);
50	50	double original = GetOriginalValue(sample);
	51	SetOriginalValue(sample, estimated);
51	52	if(!double.IsNaN(original) && !double.IsInfinity(original)) {
52	53	double error = estimated - original;

r479	r480
58	58	double estimated = GetEstimatedValue(sample);
59	59	double original = GetOriginalValue(sample);
	60	SetOriginalValue(sample, estimated);
60	61	if(!double.IsNaN(original) && !double.IsInfinity(original)) {
61	62	double error = estimated - original;

-                      r479
+                      r480
     public abstract double Evaluate(int start, int end);
+    public void SetOriginalValue(int sample, double value) {
+      if(useEstimatedValues) {
+        dataset.SetValue(sample, targetVariable, value);
+      }
+    }
     public double GetOriginalValue(int sample) {
+      if(useEstimatedValues)
+        return backupValues[sample - trainingStart];
+      else
+        return dataset.GetValue(sample, targetVariable);
+      return dataset.GetValue(sample, targetVariable);
+    }
 …
         estimated = estimatedValueMin;
+      }
-      if(useEstimatedValues) {
-        dataset.SetValue(sample, targetVariable, estimated);
+      }
       return estimated;
+    }

r479	r480
62	62	double est = GetEstimatedValue(sample);
63	63	double orig = GetOriginalValue(sample);
	64	SetOriginalValue(sample, est);
64	65	estimated[sample - start] = est;
65	66	original[sample - start] = orig;

r479	r480
48	48	double estimated = GetEstimatedValue(sample);
49	49	double original = GetOriginalValue(sample);
	50	SetOriginalValue(sample, estimated);
50	51	if(!double.IsNaN(original) && !double.IsInfinity(original)) {
51	52	double percent_error = Math.Abs((estimated - original) / original);

r479	r480
48	48	double original = GetOriginalValue(sample);
49	49	double estimated = GetEstimatedValue(sample);
	50	SetOriginalValue(sample, estimated);
50	51	if(!double.IsNaN(original) && !double.IsInfinity(original)) {
51	52	double error = estimated - original;

-                      r479
+                      r480
       for(int sample = start; sample < end; sample++) {
         ItemList row = new ItemList();
+        row.Add(new DoubleData(GetEstimatedValue(sample)));
+        row.Add(new DoubleData(GetOriginalValue(sample)));
+        double estimated = GetEstimatedValue(sample);
+        double original = GetOriginalValue(sample);
+        SetOriginalValue(sample, estimated);
+        row.Add(new DoubleData(estimated));
+        row.Add(new DoubleData(original));
         values.Add(row);
+      }

r479	r480
59	59	double estimatedChange = GetEstimatedValue(sample) - prevValue;
60	60	double originalChange = GetOriginalValue(sample) - prevValue;
	61	SetOriginalValue(sample, estimatedChange+prevValue);
61	62	if(!double.IsNaN(originalChange) && !double.IsInfinity(originalChange)) {
62	63	double error = estimatedChange - originalChange;

r479	r480
60	60	double estimated = GetEstimatedValue(sample);
61	61	double original = GetOriginalValue(sample);
	62	SetOriginalValue(sample, estimated);
62	63	if(!double.IsNaN(original) && !double.IsInfinity(original)) {
63	64	errors[sample - start] = original - estimated;

Note: See TracChangeset for help on using the changeset viewer.