Changeset 8834 for trunk

Timestamp:

10/23/12 10:28:42 (12 years ago)

Author:

sforsten

Message:

#1292: changed CalculateHoeffdingsDTest due to a change in the name of a static method

File:

• trunk/sources/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis-3.4/StatisticCalculatorsTest.cs (modified) (7 diffs)

trunk/sources/HeuristicLab.Tests/HeuristicLab.Problems.DataAnalysis-3.4/StatisticCalculatorsTest.cs

@@ -146 +146 @@
       var xs = new double[] { 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0 };
       var ys = new double[] { 2.0, 3.0, 4.0, 5.0, 6.0, 7.0, 8.0, 9.0 };
-      var d = HoeffdingsDependenceCalculator.Calculate(xs, ys, out error);
+      var d = HoeffdingsDependenceCalculator.CalculateHoeffdings(xs, ys, out error);
       Assert.AreEqual(error, OnlineCalculatorError.None);
       Assert.AreEqual(d, 1.0, 1E-5);
@@ -152 +152 @@
       // perfect negative dependency
       ys = xs.Select(x => -x).ToArray();
-      d = HoeffdingsDependenceCalculator.Calculate(xs, ys, out error);
+      d = HoeffdingsDependenceCalculator.CalculateHoeffdings(xs, ys, out error);
       Assert.AreEqual(error, OnlineCalculatorError.None);
       Assert.AreEqual(d, 1.0, 1E-5);
@@ -159 +159 @@
       xs = new double[] { 1.0, 1.0, 2.0, 2.0, 3.0, 3.0, 4.0, 4.0, 5.0, 5.0, 5.0 };
       ys = new double[] { 2.0, 2.0, 3.0, 3.0, 4.0, 4.0, 5.0, 5.0, 6.0, 6.0, 6.0 };
-      d = HoeffdingsDependenceCalculator.Calculate(xs, ys, out error);
+      d = HoeffdingsDependenceCalculator.CalculateHoeffdings(xs, ys, out error);
       Assert.AreEqual(error, OnlineCalculatorError.None);
       Assert.AreEqual(d, 0.6783, 1E-5);
@@ -166 +166 @@
       xs = new double[] { 1.0, 1.0, 1.0, 2.0, 3.0, 4.0, 5.0, 6.0, 6.0, 6.0 };
       ys = xs.Select(x => x * x).ToArray();
-      d = HoeffdingsDependenceCalculator.Calculate(xs, ys, out error);
+      d = HoeffdingsDependenceCalculator.CalculateHoeffdings(xs, ys, out error);
       Assert.AreEqual(error, OnlineCalculatorError.None);
       Assert.AreEqual(d, 0.75, 1E-5);
@@ -173 +173 @@
       xs = new double[] { 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0, 1.0 };
       ys = new double[] { 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0, 2.0 };
-      d = HoeffdingsDependenceCalculator.Calculate(xs, ys, out error);
+      d = HoeffdingsDependenceCalculator.CalculateHoeffdings(xs, ys, out error);
       Assert.AreEqual(error, OnlineCalculatorError.None);
       Assert.AreEqual(d, -0.3516, 1E-4);
@@ -184 +184 @@
 
       // independent
-      d = HoeffdingsDependenceCalculator.Calculate(xs, ys, out error);
+      d = HoeffdingsDependenceCalculator.CalculateHoeffdings(xs, ys, out error);
       Assert.AreEqual(error, OnlineCalculatorError.None);
       Assert.AreEqual(d, -0.00023, 1E-5);
@@ -192 +192 @@
       ys = xs.Select(x => x * x).ToArray();
 
-      d = HoeffdingsDependenceCalculator.Calculate(xs, ys, out error);
+      d = HoeffdingsDependenceCalculator.CalculateHoeffdings(xs, ys, out error);
       Assert.AreEqual(error, OnlineCalculatorError.None);
       Assert.AreEqual(d, 0.25071, 1E-5);
 
       // symmetric?
-      d = HoeffdingsDependenceCalculator.Calculate(ys, xs, out error);
+      d = HoeffdingsDependenceCalculator.CalculateHoeffdings(ys, xs, out error);
       Assert.AreEqual(error, OnlineCalculatorError.None);
       Assert.AreEqual(d, 0.25071, 1E-5);