swap in new allClose function

Author: andrewkern

eidos/eidos_test_builtins.h

@@ -111,7 +111,7 @@ for (iter in 1:100)
 	xbuiltin = cumProduct(x);
 	xuserdef = cumProduct_func(x);
 	// tolerance because product() can get a little roundoff error due to SIMD
-	if (!all(abs(xbuiltin - xuserdef) < abs(xuserdef) * 1e-10 + 1e-15)) stop('Mismatch in test of cumProduct(f)');
+	if (!allClose(xbuiltin, xuserdef)) stop('Mismatch in test of cumProduct(f)');
 }
 
 // ***********************************************************************************************
@@ -136,7 +136,7 @@ for (iter in 1:100)
 	xbuiltin = cumSum(x);
 	xuserdef = cumSum_func(x);
 	// tolerance because sum() can get a little roundoff error due to SIMD
-	if (!all(abs(xbuiltin - xuserdef) < 1e-10)) stop('Mismatch in test of cumSum(f)');
+	if (!allClose(xbuiltin, xuserdef)) stop('Mismatch in test of cumSum(f)');
 }
 
 // ***********************************************************************************************
@@ -272,7 +272,7 @@ for (iter in 1:100)
 	xbuiltin = mean(x);
 	xuserdef = mean_func(x);
 	// tolerance because sum() can get a little roundoff error due to SIMD
-	if (!all(abs(xbuiltin - xuserdef) < 1e-10)) stop('Mismatch in test of mean(f)');
+	if (!allClose(xbuiltin, xuserdef)) stop('Mismatch in test of mean(f)');
 }
 
 // ***********************************************************************************************
@@ -420,7 +420,7 @@ for (iter in 1:100)
 	xbuiltin = product(x);
 	xuserdef = product_func(x);
 	// tolerance because product() can get a little roundoff error due to SIMD
-	if (abs(xbuiltin - xuserdef) > abs(xuserdef) * 1e-10 + 1e-15) stop('Mismatch in test of product(f)');
+	if (!allClose(xbuiltin, xuserdef)) stop('Mismatch in test of product(f)');
 }
 
 // ***********************************************************************************************
@@ -795,7 +795,7 @@ for (iter in 1:100)
 	xbuiltin = sum(x);
 	xuserdef = sum_func(x);
 	// tolerance because sum() can get a little roundoff error due to SIMD
-	if (!all(abs(xbuiltin - xuserdef) < 1e-10)) stop('Mismatch in test of sum(f)');
+	if (!allClose(xbuiltin, xuserdef)) stop('Mismatch in test of sum(f)');
 }
 
 // ***********************************************************************************************

eidos/eidos_test_functions_other.cpp

@@ -350,7 +350,7 @@ void _RunFunctionMatrixArrayTests(void)
 	EidosAssertScriptSuccess_I("tr(matrix(1:9, ncol=3));", 1 + 5 + 9);
 	EidosAssertScriptSuccess_F("tr(matrix(1.0:9, ncol=3));", 1 + 5 + 9);
 	EidosAssertScriptSuccess_F("tr(matrix(c(1.25, -7.8, 3.4, 6.1, 4.75, 8.2, -0.3, 8.6, -1.5), ncol=3));", 1.25 + 4.75 + -1.5);
-	EidosAssertScriptSuccess_L("x = matrix(runif(100), ncol=10); abs(tr(x) - sum(diag(x))) < 1e-10;", true);  // tolerance for SIMD
+	EidosAssertScriptSuccess_L("x = matrix(runif(100), ncol=10); allClose(tr(x), sum(diag(x)));", true);  // tolerance for SIMD
 	EidosAssertScriptSuccess_L("x = matrix(rdunif(100, -1000, 1000), ncol=10); identical(tr(x), sum(diag(x)));", true);
 
 	// upperTri()
@@ -377,15 +377,15 @@ void _RunFunctionMatrixArrayTests(void)
 	EidosAssertScriptSuccess_L("x = 1.0:12; y = matrix(x, nrow=3); identical(rowSums(y), c(22.0, 26, 30));", true);
 	EidosAssertScriptSuccess_L("x = (rbinom(100, 1, 0.4) == 1); y = matrix(x, nrow=10); identical(rowSums(y), apply(y, 0, 'sum(applyValue);'));", true);
 	EidosAssertScriptSuccess_L("x = rdunif(100, -1000, 1000); y = matrix(x, nrow=10); identical(rowSums(y), apply(y, 0, 'sum(applyValue);'));", true);
-	EidosAssertScriptSuccess_L("x = runif(100); y = matrix(x, nrow=10); all(abs(rowSums(y) - apply(y, 0, 'sum(applyValue);')) < 1e-10);", true);  // tolerance for SIMD
+	EidosAssertScriptSuccess_L("x = runif(100); y = matrix(x, nrow=10); allClose(rowSums(y), apply(y, 0, 'sum(applyValue);'));", true);  // tolerance for SIMD
 
 	// colSums()
 	EidosAssertScriptSuccess_L("x = c(T,T,F,F,T,F,F,T,T,F,F,T); y = matrix(x, nrow=3); identical(colSums(y), c(2, 1, 2, 1));", true);
 	EidosAssertScriptSuccess_L("x = 1:12; y = matrix(x, nrow=3); identical(colSums(y), c(6, 15, 24, 33));", true);
 	EidosAssertScriptSuccess_L("x = 1.0:12; y = matrix(x, nrow=3); identical(colSums(y), c(6.0, 15, 24, 33));", true);
 	EidosAssertScriptSuccess_L("x = (rbinom(100, 1, 0.4) == 1); y = matrix(x, nrow=10); identical(colSums(y), apply(y, 1, 'sum(applyValue);'));", true);
 	EidosAssertScriptSuccess_L("x = rdunif(100, -1000, 1000); y = matrix(x, nrow=10); identical(colSums(y), apply(y, 1, 'sum(applyValue);'));", true);
-	EidosAssertScriptSuccess_L("x = runif(100); y = matrix(x, nrow=10); all(abs(colSums(y) - apply(y, 1, 'sum(applyValue);')) < 1e-10);", true);  // tolerance for SIMD
+	EidosAssertScriptSuccess_L("x = runif(100); y = matrix(x, nrow=10); allClose(colSums(y), apply(y, 1, 'sum(applyValue);'));", true);  // tolerance for SIMD
 }
 
 #pragma mark filesystem access