From d40de22c32b12ff8d7454ab94f25a3fa71ba9960 Mon Sep 17 00:00:00 2001
From: Wenzel Jakob <wenzel@cs.cornell.edu>
Date: Sat, 25 Jun 2011 00:33:30 +0200
Subject: [PATCH] chi-square test cleanups

---
 data/tests/test_bsdf.xml         | 18 +++++++++---------
 include/mitsuba/core/chisquare.h |  5 +----
 src/libcore/chisquare.cpp        |  4 ++++
 src/tests/test_chisquare.cpp     | 10 ++++++++--
 4 files changed, 22 insertions(+), 15 deletions(-)

diff --git a/data/tests/test_bsdf.xml b/data/tests/test_bsdf.xml
index 2450e5c7..0c826dff 100644
--- a/data/tests/test_bsdf.xml
+++ b/data/tests/test_bsdf.xml
@@ -80,6 +80,15 @@
 		<float name="alphaB" value="0.1"/>
 	</bsdf>
 
+	<!-- Test the rough glass model with the 
+		 Beckmann microfacet distribution -->
+	<bsdf type="roughglass">
+		<string name="distribution" value="beckmann"/>
+		<float name="alpha" value=".3"/>
+		<float name="intIOR" value="1.5"/>
+		<float name="extIOR" value="1.0"/>
+	</bsdf>
+
 	<!-- Test the rough glass model with the 
 		 GGX microfacet distribution -->
 	<bsdf type="roughglass">
@@ -98,14 +107,5 @@
 		<float name="extIOR" value="1.0"/>
 	</bsdf>
 
-	<!-- Test the rough glass model with the 
-		 Beckmann microfacet distribution -->
-	<bsdf type="roughglass">
-		<string name="distribution" value="beckmann"/>
-		<float name="alpha" value=".3"/>
-		<float name="intIOR" value="1.5"/>
-		<float name="extIOR" value="1.0"/>
-	</bsdf>
-
 	<camera type="perspective"/>
 </scene>
diff --git a/include/mitsuba/core/chisquare.h b/include/mitsuba/core/chisquare.h
index d09d2569..4e2e75c5 100644
--- a/include/mitsuba/core/chisquare.h
+++ b/include/mitsuba/core/chisquare.h
@@ -20,10 +20,7 @@
 #define __CHI_SQUARE_TEST_H
 
 #include <mitsuba/core/fresolver.h>
-#include <mitsuba/core/quad.h>
-#include <mitsuba/core/timer.h>
-#include <boost/bind.hpp>
-#include <boost/math/distributions/chi_squared.hpp>
+#include <boost/function.hpp>
 
 MTS_NAMESPACE_BEGIN
 
diff --git a/src/libcore/chisquare.cpp b/src/libcore/chisquare.cpp
index f1b4d003..442d88f8 100644
--- a/src/libcore/chisquare.cpp
+++ b/src/libcore/chisquare.cpp
@@ -17,6 +17,10 @@
 */
 
 #include <mitsuba/core/chisquare.h>
+#include <mitsuba/core/quad.h>
+#include <mitsuba/core/timer.h>
+#include <boost/math/distributions/chi_squared.hpp>
+#include <boost/bind.hpp>
 
 MTS_NAMESPACE_BEGIN
 
diff --git a/src/tests/test_chisquare.cpp b/src/tests/test_chisquare.cpp
index ed2b6dbf..e33a83e7 100644
--- a/src/tests/test_chisquare.cpp
+++ b/src/tests/test_chisquare.cpp
@@ -20,6 +20,12 @@
 #include <mitsuba/core/statistics.h>
 #include <mitsuba/core/chisquare.h>
 #include <mitsuba/render/testcase.h>
+#include <boost/bind.hpp>
+
+/* Statistical significance level of the test. Set to
+   1/2 percent by default -- we want there to be notable
+   evidence before failing a test case */
+#define SIGNIFICANCE_LEVEL 0.005f
 
 MTS_NAMESPACE_BEGIN
 
@@ -149,7 +155,7 @@ public:
 				);
 
 				// (the following assumes that the distribution has 1 parameter, e.g. exponent value)
-				ChiSquare::ETestResult result = chiSqr->runTest(1);
+				ChiSquare::ETestResult result = chiSqr->runTest(1, SIGNIFICANCE_LEVEL);
 				if (result == ChiSquare::EReject) {
 					std::string filename = formatString("failure_%i.m", failureCount++);
 					chiSqr->dumpTables(filename);
@@ -190,7 +196,7 @@ public:
 						);
 
 						// (the following assumes that the distribution has 1 parameter, e.g. exponent value)
-						ChiSquare::ETestResult result = chiSqr->runTest(1);
+						ChiSquare::ETestResult result = chiSqr->runTest(1, SIGNIFICANCE_LEVEL);
 						if (result == ChiSquare::EReject) {
 							std::string filename = formatString("failure_%i.m", failureCount++);
 							chiSqr->dumpTables(filename);