Changeset 400 for trunk/sources/HeuristicLab.StructureIdentification

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:

trunk/sources/HeuristicLab.StructureIdentification/Evaluation

Files:

• CoefficientOfDeterminationEvaluator.cs (modified) (1 diff)
• MCCEvaluator.cs (modified) (1 diff)
• MeanAbsolutePercentageErrorEvaluator.cs (modified) (1 diff)
• TheilInequalityCoefficientEvaluator.cs (modified) (1 diff)
• VarianceAccountedForEvaluator.cs (modified) (1 diff)

trunk/sources/HeuristicLab.StructureIdentification/Evaluation/CoefficientOfDeterminationEvaluator.cs

@@ -67 +67 @@
         }
       }
+
+      scope.GetVariableValue<DoubleData>("TotalEvaluatedNodes", true).Data = totalEvaluatedNodes + treeSize * (trainingEnd - trainingStart);
+
       double quality = 1 - errorsSquaredSum / originalDeviationTotalSumOfSquares;
       if(quality > 1) 

trunk/sources/HeuristicLab.StructureIdentification/Evaluation/MCCEvaluator.cs

@@ -90 +90 @@
         }
       }
+      scope.GetVariableValue<DoubleData>("TotalEvaluatedNodes", true).Data = totalEvaluatedNodes + treeSize * (trainingEnd - trainingStart);
       return best_mcc;
     }

trunk/sources/HeuristicLab.StructureIdentification/Evaluation/MeanAbsolutePercentageErrorEvaluator.cs

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

trunk/sources/HeuristicLab.StructureIdentification/Evaluation/TheilInequalityCoefficientEvaluator.cs

@@ -71 +71 @@
       }
       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;

trunk/sources/HeuristicLab.StructureIdentification/Evaluation/VarianceAccountedForEvaluator.cs

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