From 4efec1fa1dc08f4472531ef5b24de4d4e1b74aa9 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Thu, 22 Aug 2019 16:26:14 +0200
Subject: cellcompare_check: Fix terminology, and reduce number of trials

---
 tests/cellcompare_check.c | 18 ++++++++----------
 1 file changed, 8 insertions(+), 10 deletions(-)

(limited to 'tests/cellcompare_check.c')

diff --git a/tests/cellcompare_check.c b/tests/cellcompare_check.c
index 7aa59fe4..f674a7f2 100644
--- a/tests/cellcompare_check.c
+++ b/tests/cellcompare_check.c
@@ -51,7 +51,7 @@ static void complain(UnitCell *cell, UnitCell *cref, const char *t, const char *
 }
 
 
-static RationalMatrix *random_reindexing(gsl_rng *rng)
+static RationalMatrix *random_derivative(gsl_rng *rng)
 {
 	int i, j;
 	RationalMatrix *tr;
@@ -262,7 +262,7 @@ int main(int argc, char *argv[])
 	UnitCell *cell, *cref;
 	gsl_rng *rng;
 	int i;
-	const int ntrial = 100;
+	const int ntrial = 10;
 	double tols[] = { 0.01, 0.01, 0.01,
 	                  deg2rad(1.0), deg2rad(1.0), deg2rad(1.0) };
 
@@ -336,7 +336,7 @@ int main(int argc, char *argv[])
 		progress_bar(i+1, ntrial, "Rotation with axis permutation");
 	}
 
-	/* Reindex */
+	/* Derivative lattice */
 	for ( i=0; i<ntrial; i++ ) {
 
 		RationalMatrix *tr;
@@ -346,7 +346,7 @@ int main(int argc, char *argv[])
 		do {
 			cell_free(cell);
 			rtnl_mtx_free(tr);
-			tr = random_reindexing(rng);
+			tr = random_derivative(rng);
 			cell = cell_transform_rational(cref, tr);
 		} while ( (cell_get_centering(cell) == '?')
 		       || (cell_get_centering(cell) == 'H' ) );
@@ -362,10 +362,10 @@ int main(int argc, char *argv[])
 
 		cell_free(cell);
 		rtnl_mtx_free(tr);
-		progress_bar(i+1, ntrial, "Reindexing");
+		progress_bar(i+1, ntrial, "Derivative lattice");
 	}
 
-	/* Reindex and rotate */
+	/* Derivative lattice and rotate */
 	for ( i=0; i<ntrial; i++ ) {
 
 		RationalMatrix *tr;
@@ -379,7 +379,7 @@ int main(int argc, char *argv[])
 		do {
 			cell_free(cell);
 			rtnl_mtx_free(tr);
-			tr = random_reindexing(rng);
+			tr = random_derivative(rng);
 			cell = cell_transform_rational(cell2, tr);
 		} while ( (cell_get_centering(cell) == '?')
 		       || (cell_get_centering(cell) == 'H' ) );  /* See above */
@@ -393,11 +393,9 @@ int main(int argc, char *argv[])
 
 		cell_free(cell);
 		rtnl_mtx_free(tr);
-		progress_bar(i+1, ntrial, "Reindexing with rotation");
+		progress_bar(i+1, ntrial, "Derivative lattice with rotation");
 	}
 
-	/* NB There's no compare_reindexed_cell_parameters_and_orientation */
-
 	cell_free(cref);
 	gsl_rng_free(rng);
 
-- 
cgit v1.2.3