Context Navigation

Changeset 400

Timestamp:

07/29/08 16:30:36 (16 years ago)

Author:

gkronber

Message:

fixed #156 (All GP-evaluators should update the number of total evaluated nodes)

Location:

Files:

r396	r400
67	67	}
68	68	}
	69
	70	scope.GetVariableValue<DoubleData>("TotalEvaluatedNodes", true).Data = totalEvaluatedNodes + treeSize * (trainingEnd - trainingStart);
	71
69	72	double quality = 1 - errorsSquaredSum / originalDeviationTotalSumOfSquares;
70	73	if(quality > 1)

r396	r400
90	90	}
91	91	}
	92	scope.GetVariableValue<DoubleData>("TotalEvaluatedNodes", true).Data = totalEvaluatedNodes + treeSize * (trainingEnd - trainingStart);
92	93	return best_mcc;
93	94	}

r396	r400
63	63	}
64	64	int nSamples = trainingEnd - trainingStart;
	65	scope.GetVariableValue<DoubleData>("TotalEvaluatedNodes", true).Data = totalEvaluatedNodes + treeSize * nSamples;
65	66	double quality = errorsSum / nSamples;
66	67	if(double.IsNaN(quality) \|\| double.IsInfinity(quality))

-                      r396
+                      r400
+      }
       int nSamples = trainingEnd - trainingStart;
+      double quality = Math.Sqrt(errorsSquaredSum / nSamples) / (Math.Sqrt(estimatedSquaredSum/nSamples) + Math.Sqrt(originalSquaredSum/nSamples));
+      scope.GetVariableValue<DoubleData>("TotalEvaluatedNodes", true).Data = totalEvaluatedNodes + treeSize * nSamples;
+      double quality = Math.Sqrt(errorsSquaredSum / nSamples) / (Math.Sqrt(estimatedSquaredSum / nSamples) + Math.Sqrt(originalSquaredSum / nSamples));
       if(double.IsNaN(quality) || double.IsInfinity(quality))
         quality = double.MaxValue;

r396	r400
74	74	originalTargetVariableValues[sample-trainingStart] = original;
75	75	}
	76	scope.GetVariableValue<DoubleData>("TotalEvaluatedNodes", true).Data = totalEvaluatedNodes + treeSize * (trainingEnd-trainingStart);
76	77
77	78	double errorsVariance = Statistics.Variance(errors);

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