--- ray/src/util/rttree_reduce.c	2011/06/01 16:51:03	2.3
+++ ray/src/util/rttree_reduce.c	2016/08/18 00:52:48	2.16
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rttree_reduce.c,v 2.3 2011/06/01 16:51:03 greg Exp $";
+static const char RCSid[] = "$Id: rttree_reduce.c,v 2.16 2016/08/18 00:52:48 greg Exp $";
 #endif
 /*
  *  A utility called by genBSDF.pl to reduce tensor tree samples and output
@@ -17,7 +17,7 @@ float	*datarr;		/* our loaded BSDF data array */
 int	ttrank = 4;		/* tensor tree rank */
 int	log2g = 4;		/* log2 of grid resolution */
 int	infmt = 'a';		/* input format ('a','f','d') */
-double	pctcull = 99.;		/* target culling percentile */
+double	pctcull = 95.;		/* target culling percentile */
 
 #define dval3(ix,ox,oy)		datarr[((((ix)<<log2g)+(ox))<<log2g)+(oy)]
 #define dval4(ix,iy,ox,oy)	datarr[((((((ix)<<log2g)+(iy))<<log2g)+(ox))<<log2g)+(oy)]
@@ -44,7 +44,7 @@ double	tthresh;		/* acceptance threshold (TBD) */
 static void
 new_kids(TNODE *pn)
 {
-	pn->kid = (TNODE *)calloc(1<<ttrank, sizeof(TNODE));
+	pn->kid = (TNODE *)calloc((size_t)1<<ttrank, sizeof(TNODE));
 	if (pn->kid == NULL)
 		error(SYSTEM, "out of memory in new_kids");
 }
@@ -110,7 +110,7 @@ build_tree(TNODE *tp, const int bmin[], int l2s)
 
 /* Set our trimming threshold */
 static void
-set_threshold()
+set_threshold(void)
 {
 	int	hsum = 0;
 	int	i;
@@ -152,10 +152,10 @@ print_tree(const TNODE *tp, const int bmin[], int l2s)
 		for (i = 0; i < 1<<ttrank; i++) {
 			float	val;
 			for (j = ttrank; j--; )
-				bkmin[j] = bmin[j] + (i>>j & 1);
+				bkmin[j] = bmin[j] + (i>>(ttrank-1-j) & 1);
 			val = (ttrank == 3) ? dval3(bkmin[0],bkmin[1],bkmin[2])
 				: dval4(bkmin[0],bkmin[1],bkmin[2],bkmin[3]);
-			printf(" %.4e", val);
+			printf((0.001<=val)&(val<10.) ? " %.7f" : " %.3e", val);
 		}
 		fputs(" }\n", stdout);
 		return;
@@ -201,7 +201,7 @@ read_float(float *rowp, int n)
 
 	if ((rowp == NULL) | (n <= 0))
 		return(0);
-	nread = fread(rowp, sizeof(float), n, stdin);
+	nread = getbinary(rowp, sizeof(float), n, stdin);
 	if (nread != n)
 		error(USER, "unexpected EOF on float input");
 	return(nread);
@@ -227,7 +227,7 @@ read_double(float *rowp, int n)
 		if (rowbuf == NULL)
 			error(SYSTEM, "out of memory in read_double");
 	}
-	nread = fread(rowbuf, sizeof(double), n, stdin);
+	nread = getbinary(rowbuf, sizeof(double), n, stdin);
 	if (nread != n)
 		error(USER, "unexpected EOF on double input");
 	for (i = 0; i < nread; i++)
@@ -235,9 +235,30 @@ read_double(float *rowp, int n)
 	return(nread);
 }
 
+/* Truncate any negative values to zero */
+static void
+noneg(float *varr, int n)
+{
+	int	nnan = 0;
+
+	while (n-- > 0) {
+#ifdef isnan
+		if (isnan(*varr)) {
+			*varr = 0;
+			++nnan;
+		} else
+#endif
+		if (*varr < 0) *varr = 0;
+		++varr;
+	}
+	if (nnan)
+		fprintf(stderr, "Warning: BSDF data contains %d NaN values\n",
+				nnan);
+}
+
 /* Load data array, filling zeroes for rank 3 demi-tensor */
 static void
-load_data()
+load_data(void)
 {
 	int	(*readf)(float *, int) = NULL;
 	
@@ -255,22 +276,22 @@ load_data()
 		error(COMMAND, "unsupported input format");
 		break;
 	}
-	datarr = (float *)calloc(1<<(log2g*ttrank), sizeof(float));
+	datarr = (float *)calloc((size_t)1<<(log2g*ttrank), sizeof(float));
 	if (datarr == NULL)
 		error(SYSTEM, "out of memory in load_data");
 	if (ttrank == 3) {
 		int	ix, ox;
-		for (ix = 0; ix < 1<<log2g; ix++)
+		for (ix = 0; ix < 1<<(log2g-1); ix++)
 			for (ox = 0; ox < 1<<log2g; ox++)
-				(*readf)(datarr+((((ix)<<log2g)+(ox))<<log2g),
-						1<<(log2g-1));
+				(*readf)(datarr+(((ix<<log2g)+ox)<<log2g),
+						1<<log2g);
 	} else /* ttrank == 4 */ {
 		int	ix, iy, ox;
 		for (ix = 0; ix < 1<<log2g; ix++)
 		    for (iy = 0; iy < 1<<log2g; iy++)
 			for (ox = 0; ox < 1<<log2g; ox++)
 				(*readf)(datarr +
-				((((((ix)<<log2g)+(iy))<<log2g)+(ox))<<log2g),
+				(((((ix<<log2g)+iy)<<log2g)+ox)<<log2g),
 						1<<log2g);
 	}
 	(*readf)(NULL, 0);	/* releases any buffers */
@@ -289,19 +310,54 @@ load_data()
 		}
 	} else if (getc(stdin) != EOF)
 		error(WARNING, "binary data past end of expected input");
+
+	noneg(datarr, 1<<(log2g*ttrank));	/* take precautions */
 }
 
+/* Enforce reciprocity by averaging data values */
+static void
+do_reciprocity(void)
+{
+	const int	siz = 1<<log2g;
+	float		*v1p, *v2p;
+
+	if (ttrank == 3) {
+		int	ix, ox, oy;
+		for (ix = 0; ix < siz>>1; ix++)
+		    for (ox = 0; ox < siz; ox++)
+		        for (oy = 0; oy < siz>>1; oy++) {
+				v1p = &dval3(ix,ox,oy);
+				v2p = &dval3(ix,ox,siz-1-oy);
+				*v1p = *v2p = .5f*( *v1p + *v2p );
+			}
+	} else /* ttrank == 4 */ {
+		int	ix, iy, ox, oy;
+		for (ix = 1; ix < siz; ix++)
+		    for (iy = 1; iy < siz; iy++)
+			for (ox = 0; ox < ix; ox++)
+			    for (oy = 0; oy < iy; oy++) {
+				v1p = &dval4(siz-1-ix,siz-1-iy,ox,oy);
+				v2p = &dval4(siz-1-ox,siz-1-oy,ix,iy);
+				*v1p = *v2p = .5f*( *v1p + *v2p );
+			    }
+	}
+}
+
 /* Load BSDF array, coalesce uniform regions and format as tensor tree */
 int
 main(int argc, char *argv[])
 {
 	int	doheader = 1;
+	int	recipavg = 0;
 	int	bmin[4];
 	TNODE	gtree;
 	int	i;
 					/* get options and parameters */
 	for (i = 1; i < argc && argv[i][0] == '-'; i++)
 		switch (argv[i][1]) {
+		case 'a':
+			recipavg = !recipavg;
+			break;
 		case 'h':
 			doheader = !doheader;
 			break;
@@ -331,13 +387,18 @@ main(int argc, char *argv[])
 	if (i < argc-1)
 		goto userr;
 					/* load input data */
-	if (i == argc-1 && freopen(argv[i], "rb", stdin) == NULL) {
+	if (i == argc-1 && freopen(argv[i], "r", stdin) == NULL) {
 		sprintf(errmsg, "cannot open input file '%s'", argv[i]);
 		error(SYSTEM, errmsg);
 	}
 	if (infmt != 'a')
 		SET_FILE_BINARY(stdin);
+#ifdef getc_unlocked			/* avoid lock/unlock overhead */
+	flockfile(stdin);
+#endif
 	load_data();
+	if (recipavg)
+		do_reciprocity();
 	if (doheader) {
 		for (i = 0; i < argc; i++) {
 			fputs(argv[i], stdout);
@@ -359,7 +420,7 @@ main(int argc, char *argv[])
 	*/
 	return(0);
 userr:
-	fprintf(stderr, "Usage: %s [-h][-f{a|f|d}][-r {3|4}][-g log2grid][-t trim%%] [input]\n",
+	fprintf(stderr, "Usage: %s [-h][-a][-f{a|f|d}][-r {3|4}][-g log2grid][-t trim%%] [input]\n",
 			argv[0]);
 	return(1);
 }