Changeset 17602 for branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeVectorInterpreter.cs

Timestamp:

06/16/20 11:21:34 (4 years ago)

Author:

pfleck

Message:

#3040

• Changed stddev, variance, etc. to population variant
• Added multiplicative simplifications for stdev and variance symbols

File:

• branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeVectorInterpreter.cs (modified) (3 diffs)

branches/3040_VectorBasedGP/HeuristicLab.Problems.DataAnalysis.Symbolic/3.4/Interpreter/SymbolicDataAnalysisExpressionTreeVectorInterpreter.cs

@@ -415 +415 @@
             var cur = Evaluate(dataset, ref row, state);
             return AggregateApply(cur,
-              s => double.NaN,
-              v => Statistics.StandardDeviation(v));
+              s => 0,
+              v => Statistics.PopulationStandardDeviation(v));
           }
         case OpCodes.Length: {
@@ -439 +439 @@
             var cur = Evaluate(dataset, ref row, state);
             return AggregateApply(cur,
+              s => 0,
+              v => Statistics.PopulationVariance(v));
+          }
+        case OpCodes.Skewness: {
+            var cur = Evaluate(dataset, ref row, state);
+            return AggregateApply(cur,
               s => double.NaN,
-              v => Statistics.Variance(v));
-          }
-        case OpCodes.Skewness: {
+              v => Statistics.PopulationSkewness(v));
+          }
+        case OpCodes.Kurtosis: {
             var cur = Evaluate(dataset, ref row, state);
             return AggregateApply(cur,
               s => double.NaN,
-              v => Statistics.Skewness(v));
-          }
-        case OpCodes.Kurtosis: {
-            var cur = Evaluate(dataset, ref row, state);
-            return AggregateApply(cur,
-              s => double.NaN,
-              v => Statistics.Kurtosis(v));
+              v => Statistics.PopulationKurtosis(v));
           }
         case OpCodes.EuclideanDistance: {
@@ -470 +470 @@
               //(s1, v2) => 0,
               //(v1, s2) => 0,
-              vvFunc: (v1, v2) => v1.Count == v2.Count ? Statistics.Covariance(v1, v2) : double.NaN);
+              vvFunc: (v1, v2) => v1.Count == v2.Count ? Statistics.PopulationCovariance(v1, v2) : double.NaN);
           }
         case OpCodes.Variable: {