* Histogram test

Author: David Cock

.hgignore

@@ -14,6 +14,7 @@ test/*.capacity
 test/*.cm
 test/*.plot
 test/*.sim
+test/*.hist_test
 sample_error
 channel_hist
 log
@@ -24,3 +25,4 @@ smooth
 drop_samples
 row_average
 test_sparse
+test_hist

Makefile

@@ -106,6 +106,8 @@ row_average: row_average.o ${SPARSE_OBJS}
 
 TEST_MATRICES=matrix1
 
+HIST_TEST=matrix1
+
 ifdef BIGMEM
     # This matrix requires 2.5GB of memory to build, and roughly 2*ncores GB
     # to simulate
@@ -117,6 +119,9 @@ TEST_TARGETS= \
     $(patsubst %,test/%.capacity,${TEST_MATRICES}) \
     $(patsubst %,test/%.sim,${TEST_MATRICES})
 
+HIST_TEST_TARGETS= \
+    $(patsubst %,test/%.hist_test,${HIST_TEST})
+
 %.cm: %.samples.xz channel_matrix
 	xzcat $< | ./channel_matrix $@
 
@@ -129,7 +134,10 @@ TEST_TARGETS= \
 %.sim: %.cm sample_error
 	./sample_error $< 100 10 1e-3 1 0 1 > $@
 
-test: ${TEST_TARGETS} test_sparse
+%.hist_test: %.samples.xz test_hist
+	xzcat $< | ./test_hist > $@
+
+test: ${TEST_TARGETS} ${HIST_TEST_TARGETS} test_sparse
 	./test_sparse
 
 ###

test_hist.c

@@ -56,6 +56,8 @@ main(int argc, char *argv[]) {
 
     printf(" done.\n");
 
+    if(!bsc_check(H, 1)) abort();
+
     bsc_stats(H);
 
     col= malloc(H->end_row * sizeof(int));
@@ -64,19 +66,21 @@ main(int argc, char *argv[]) {
         exit(EXIT_FAILURE);
     }
 
-    printf("Recounting all entries...\n");
+    printf("Recounting all entries...");
     fflush(stdout);
 
     for(c= 0; c < H->end_col; c++) {
         size_t i;
-        if(c != 0 && c % 10 == 0)
-            printf("%d/%d\n", c, H->end_col);
         bzero(col, H->end_row * sizeof(int));
         if(H->end_rows[c] <= H->start_rows[c]) continue;
         for(i= 0; i < nread; i++) {
-            if(data[i].c == c) col[data[i].r]++;
+            if(data[i].c == c) {
+                assert(H->start_rows[c] <= data[i].r);
+                assert(data[i].r < H->end_rows[c]);
+                col[data[i].r]++;
+            }
         }
-        for(r= H->start_rows[c]; r < H->end_rows[c]; r++) {
+        for(r= H->start_rows[c]; r < H->end_rows[c] && r < H->end_row; r++) {
             int ri= r - H->start_rows[c];
 
             if(col[r] != H->entries[c][ri]) {