--- ray/src/util/rmatrix.c	2014/05/31 19:21:21	2.2
+++ ray/src/util/rmatrix.c	2019/08/12 04:46:34	2.32
@@ -1,5 +1,5 @@
 #ifndef lint
-static const char RCSid[] = "$Id: rmatrix.c,v 2.2 2014/05/31 19:21:21 greg Exp $";
+static const char RCSid[] = "$Id: rmatrix.c,v 2.32 2019/08/12 04:46:34 greg Exp $";
 #endif
 /*
  * General matrix operations.
@@ -9,13 +9,14 @@ static const char RCSid[] = "$Id: rmatrix.c,v 2.2 2014
 #include <stdlib.h>
 #include <string.h>
 #include <fcntl.h>
+#include <errno.h>
+#include "rtio.h"
+#include "platform.h"
 #include "resolu.h"
+#include "paths.h"
 #include "rmatrix.h"
 
-typedef struct {
-	int	nrows, ncols, ncomp;
-	int	dtype;
-} DMINFO;
+static char	rmx_mismatch_warn[] = "WARNING: data type mismatch\n";
 
 /* Allocate a nr x nc matrix with n components */
 RMATRIX *
@@ -30,16 +31,61 @@ rmx_alloc(int nr, int nc, int n)
 	if (dnew == NULL)
 		return(NULL);
 	dnew->nrows = nr; dnew->ncols = nc; dnew->ncomp = n;
+	dnew->dtype = DTdouble;
+	dnew->info = NULL;
 	return(dnew);
 }
 
+/* Free a RMATRIX array */
+void
+rmx_free(RMATRIX *rm)
+{
+	if (!rm) return;
+	if (rm->info)
+		free(rm->info);
+	free(rm);
+}
+
+/* Resolve data type based on two input types (returns 0 for mismatch) */
+int
+rmx_newtype(int dtyp1, int dtyp2)
+{
+	if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) |
+			(dtyp2==DTxyze) | (dtyp2==DTrgbe)
+			&& dtyp1 != dtyp2)
+		return(0);
+	if (dtyp1 < dtyp2)
+		return(dtyp1);
+	return(dtyp2);
+}
+
+/* Append header information associated with matrix data */
+int
+rmx_addinfo(RMATRIX *rm, const char *info)
+{
+	if (!info || !*info)
+		return(0);
+	if (!rm->info) {
+		rm->info = (char *)malloc(strlen(info)+1);
+		if (rm->info) rm->info[0] = '\0';
+	} else
+		rm->info = (char *)realloc(rm->info,
+				strlen(rm->info)+strlen(info)+1);
+	if (!rm->info)
+		return(0);
+	strcat(rm->info, info);
+	return(1);
+}
+
 static int
 get_dminfo(char *s, void *p)
 {
-	DMINFO	*ip = (DMINFO *)p;
-	char	fmt[32];
+	RMATRIX	*ip = (RMATRIX *)p;
+	char	fmt[MAXFMTLEN];
 	int	i;
 
+	if (headidval(fmt, s))
+		return(0);
 	if (!strncmp(s, "NCOMP=", 6)) {
 		ip->ncomp = atoi(s+6);
 		return(0);
@@ -52,8 +98,10 @@ get_dminfo(char *s, void *p)
 		ip->ncols = atoi(s+6);
 		return(0);
 	}
-	if (!formatval(fmt, s))
+	if (!formatval(fmt, s)) {
+		rmx_addinfo(ip, s);
 		return(0);
+	}
 	for (i = 1; i < DTend; i++)
 		if (!strcmp(fmt, cm_fmt_id[i])) {
 			ip->dtype = i;
@@ -66,9 +114,7 @@ static int
 rmx_load_ascii(RMATRIX *rm, FILE *fp)
 {
 	int	i, j, k;
-#ifdef _WIN32
-	_setmode(fileno(fp), _O_TEXT);
-#endif
+
 	for (i = 0; i < rm->nrows; i++)
 	    for (j = 0; j < rm->ncols; j++)
 	        for (k = 0; k < rm->ncomp; k++)
@@ -89,7 +135,7 @@ rmx_load_float(RMATRIX *rm, FILE *fp)
 	}
 	for (i = 0; i < rm->nrows; i++)
 	    for (j = 0; j < rm->ncols; j++) {
-		if (fread(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
+		if (getbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
 		    return(0);
 	        for (k = rm->ncomp; k--; )
 		     rmx_lval(rm,i,j,k) = val[k];
@@ -100,20 +146,12 @@ rmx_load_float(RMATRIX *rm, FILE *fp)
 static int
 rmx_load_double(RMATRIX *rm, FILE *fp)
 {
-	int	i, j, k;
-	double	val[100];
+	int	i, j;
 
-	if (rm->ncomp > 100) {
-		fputs("Unsupported # components in rmx_load_double()\n", stderr);
-		exit(1);
-	}
 	for (i = 0; i < rm->nrows; i++)
-	    for (j = 0; j < rm->ncols; j++) {
-		if (fread(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
+	    for (j = 0; j < rm->ncols; j++)
+		if (getbinary(&rmx_lval(rm,i,j,0), sizeof(double), rm->ncomp, fp) != rm->ncomp)
 		    return(0);
-	        for (k = rm->ncomp; k--; )
-		     rmx_lval(rm,i,j,k) = val[k];
-	    }
 	return(1);
 }
 
@@ -142,79 +180,109 @@ rmx_load_rgbe(RMATRIX *rm, FILE *fp)
 
 /* Load matrix from supported file type */
 RMATRIX *
-rmx_load(const char *fname)
+rmx_load(const char *inspec)
 {
 	FILE		*fp = stdin;
-	DMINFO		dinfo;
+	RMATRIX		dinfo;
 	RMATRIX		*dnew;
 
-	if (fname == NULL) {			/* reading from stdin? */
-		fname = "<stdin>";
+	if (inspec == NULL) {			/* reading from stdin? */
+		inspec = "<stdin>";
+		SET_FILE_BINARY(stdin);
+	} else if (inspec[0] == '!') {
+		if ((fp = popen(inspec+1, "r")) == NULL)
+			return(NULL);
+		SET_FILE_BINARY(stdin);
 	} else {
-		const char	*sp = fname;	/* check suffix */
+		const char	*sp = inspec;	/* check suffix */
 		while (*sp)
 			++sp;
-		while (sp > fname && sp[-1] != '.')
+		while (sp > inspec && sp[-1] != '.')
 			--sp;
 		if (!strcasecmp(sp, "XML")) {	/* assume it's a BSDF */
-			CMATRIX	*cm = cm_loadBTDF((char *)fname);
+			CMATRIX	*cm = cm_loadBTDF((char *)inspec);
 			if (cm == NULL)
 				return(NULL);
 			dnew = rmx_from_cmatrix(cm);
 			cm_free(cm);
+			dnew->dtype = DTascii;
 			return(dnew);
 		}
 						/* else open it ourselves */
-		if ((fp = fopen(fname, "rb")) == NULL)
+		if ((fp = fopen(inspec, "rb")) == NULL)
 			return(NULL);
 	}
 #ifdef getc_unlocked
 	flockfile(fp);
 #endif
 	dinfo.nrows = dinfo.ncols = dinfo.ncomp = 0;
-	dinfo.dtype = DTascii;
-	if (getheader(fp, &get_dminfo, &dinfo) < 0) {
+	dinfo.dtype = DTascii;			/* assumed w/o FORMAT */
+	dinfo.info = NULL;
+	if (getheader(fp, get_dminfo, &dinfo) < 0) {
 		fclose(fp);
 		return(NULL);
 	}
-	if ((dinfo.dtype == DTrgbe) | (dinfo.dtype == DTxyze)) {
+	if ((dinfo.nrows <= 0) | (dinfo.ncols <= 0)) {
 		if (!fscnresolu(&dinfo.ncols, &dinfo.nrows, fp)) {
 			fclose(fp);
 			return(NULL);
 		}
-		dinfo.ncomp = 3;
+		if (dinfo.ncomp <= 0)
+			dinfo.ncomp = 3;
+		else if ((dinfo.dtype == DTrgbe) | (dinfo.dtype == DTxyze) &&
+				dinfo.ncomp != 3) {
+			fclose(fp);
+			return(NULL);
+		}
 	}
 	dnew = rmx_alloc(dinfo.nrows, dinfo.ncols, dinfo.ncomp);
 	if (dnew == NULL) {
 		fclose(fp);
 		return(NULL);
 	}
+	dnew->info = dinfo.info;
 	switch (dinfo.dtype) {
 	case DTascii:
+		SET_FILE_TEXT(stdin);
 		if (!rmx_load_ascii(dnew, fp))
 			goto loaderr;
+		dnew->dtype = DTascii;		/* should leave double? */
 		break;
 	case DTfloat:
 		if (!rmx_load_float(dnew, fp))
 			goto loaderr;
+		dnew->dtype = DTfloat;
 		break;
 	case DTdouble:
 		if (!rmx_load_double(dnew, fp))
 			goto loaderr;
+		dnew->dtype = DTdouble;
 		break;
 	case DTrgbe:
 	case DTxyze:
 		if (!rmx_load_rgbe(dnew, fp))
 			goto loaderr;
+		dnew->dtype = dinfo.dtype;
 		break;
 	default:
 		goto loaderr;
 	}
-	if (fp != stdin)
-		fclose(fp);
+	if (fp != stdin) {
+		if (inspec[0] == '!')
+			pclose(fp);
+		else
+			fclose(fp);
+	}
+#ifdef getc_unlocked
+	else
+		funlockfile(fp);
+#endif
 	return(dnew);
 loaderr:					/* should report error? */
-	fclose(fp);
+	if (inspec[0] == '!')
+		pclose(fp);
+	else
+		fclose(fp);
 	rmx_free(dnew);
 	return(NULL);
 }
@@ -222,14 +290,15 @@ loaderr:					/* should report error? */
 static int
 rmx_write_ascii(const RMATRIX *rm, FILE *fp)
 {
+	const char	*fmt = (rm->dtype == DTfloat) ? " %.7e" :
+			(rm->dtype == DTrgbe) | (rm->dtype == DTxyze) ? " %.3e" :
+				" %.15e" ;
 	int	i, j, k;
-#ifdef _WIN32
-	_setmode(fileno(fp), _O_TEXT);
-#endif
+
 	for (i = 0; i < rm->nrows; i++) {
 	    for (j = 0; j < rm->ncols; j++) {
 	        for (k = 0; k < rm->ncomp; k++)
-		    fprintf(fp, " %.15e", rmx_lval(rm,i,j,k));
+		    fprintf(fp, fmt, rmx_lval(rm,i,j,k));
 		fputc('\t', fp);
 	    }
 	    fputc('\n', fp);
@@ -251,7 +320,7 @@ rmx_write_float(const RMATRIX *rm, FILE *fp)
 	    for (j = 0; j < rm->ncols; j++) {
 	        for (k = rm->ncomp; k--; )
 		    val[k] = (float)rmx_lval(rm,i,j,k);
-		if (fwrite(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
+		if (putbinary(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
 			return(0);
 	    }
 	return(1);
@@ -260,37 +329,29 @@ rmx_write_float(const RMATRIX *rm, FILE *fp)
 static int
 rmx_write_double(const RMATRIX *rm, FILE *fp)
 {
-	int	i, j, k;
-	double	val[100];
+	int	i, j;
 
-	if (rm->ncomp > 100) {
-		fputs("Unsupported # components in rmx_write_double()\n", stderr);
-		exit(1);
-	}
 	for (i = 0; i < rm->nrows; i++)
-	    for (j = 0; j < rm->ncols; j++) {
-	        for (k = rm->ncomp; k--; )
-		    val[k] = rmx_lval(rm,i,j,k);
-		if (fwrite(val, sizeof(val[0]), rm->ncomp, fp) != rm->ncomp)
+	    for (j = 0; j < rm->ncols; j++)
+		if (putbinary(&rmx_lval(rm,i,j,0), sizeof(double), rm->ncomp, fp) != rm->ncomp)
 			return(0);
-	    }
 	return(1);
 }
 
 static int
 rmx_write_rgbe(const RMATRIX *rm, FILE *fp)
 {
-	COLOR	*scan = (COLOR *)malloc(sizeof(COLOR)*rm->ncols);
+	COLR	*scan = (COLR *)malloc(sizeof(COLR)*rm->ncols);
 	int	i, j;
 
 	if (scan == NULL)
 		return(0);
 	for (i = 0; i < rm->nrows; i++) {
 	    for (j = rm->ncols; j--; )
-	        setcolor(scan[j],	rmx_lval(rm,i,j,0),
+	        setcolr(scan[j],	rmx_lval(rm,i,j,0),
 					rmx_lval(rm,i,j,1),
 					rmx_lval(rm,i,j,2)	);
-	    if (fwritescan(scan, rm->ncols, fp) < 0) {
+	    if (fwritecolrs(scan, rm->ncols, fp) < 0) {
 		free(scan);
 		return(0);
 	    }
@@ -299,8 +360,8 @@ rmx_write_rgbe(const RMATRIX *rm, FILE *fp)
 	return(1);
 }
 
-/* Write matrix to file type indicated by dt */
-long
+/* Write matrix to file type indicated by dtype */
+int
 rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
 {
 	RMATRIX	*mydm = NULL;
@@ -308,7 +369,18 @@ rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
 
 	if ((rm == NULL) | (fp == NULL))
 		return(0);
+#ifdef getc_unlocked
+	flockfile(fp);
+#endif
 						/* complete header */
+	if (rm->info)
+		fputs(rm->info, fp);
+	if (dtype == DTfromHeader)
+		dtype = rm->dtype;
+	else if ((dtype == DTrgbe) & (rm->dtype == DTxyze))
+		dtype = DTxyze;
+	else if ((dtype == DTxyze) & (rm->dtype == DTrgbe))
+		dtype = DTrgbe;
 	if ((dtype != DTrgbe) & (dtype != DTxyze)) {
 		fprintf(fp, "NROWS=%d\n", rm->nrows);
 		fprintf(fp, "NCOLS=%d\n", rm->ncols);
@@ -344,8 +416,11 @@ rmx_write(const RMATRIX *rm, int dtype, FILE *fp)
 		return(0);
 	}
 	ok &= (fflush(fp) == 0);
+#ifdef getc_unlocked
+	funlockfile(fp);
+#endif
 	rmx_free(mydm);
-	return(ftell(fp) * ok);		/* return # bytes written */
+	return(ok);
 }
 
 /* Allocate and assign square identity matrix with n components */
@@ -353,16 +428,14 @@ RMATRIX *
 rmx_identity(const int dim, const int n)
 {
 	RMATRIX	*rid = rmx_alloc(dim, dim, n);
-	int	i;
+	int	i, k;
 
 	if (rid == NULL)
 		return(NULL);
-	memset(rid->mtx, 0, sizeof(rid->mtx[0])*dim*dim);
+	memset(rid->mtx, 0, sizeof(rid->mtx[0])*n*dim*dim);
 	for (i = dim; i--; )
-		rmx_lval(rid,i,i,0) = 1;
-	for (i = n; --i; )
-		memcpy(rid->mtx+i*(dim*dim), rid->mtx,
-				sizeof(rid->mtx[0])*dim*dim);
+	    for (k = n; k--; )
+		rmx_lval(rid,i,i,k) = 1;
 	return(rid);
 }
 
@@ -377,6 +450,8 @@ rmx_copy(const RMATRIX *rm)
 	dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp);
 	if (dnew == NULL)
 		return(NULL);
+	rmx_addinfo(dnew, rm->info);
+	dnew->dtype = rm->dtype;
 	memcpy(dnew->mtx, rm->mtx,
 		sizeof(rm->mtx[0])*rm->ncomp*rm->nrows*rm->ncols);
 	return(dnew);
@@ -391,9 +466,22 @@ rmx_transpose(const RMATRIX *rm)
 
 	if (rm == NULL)
 		return(0);
+	if ((rm->nrows == 1) | (rm->ncols == 1)) {
+		dnew = rmx_copy(rm);
+		if (dnew == NULL)
+			return(NULL);
+		dnew->nrows = rm->ncols;
+		dnew->ncols = rm->nrows;
+		return(dnew);
+	}
 	dnew = rmx_alloc(rm->ncols, rm->nrows, rm->ncomp);
 	if (dnew == NULL)
 		return(NULL);
+	if (rm->info) {
+		rmx_addinfo(dnew, rm->info);
+		rmx_addinfo(dnew, "Transposed rows and columns\n");
+	}
+	dnew->dtype = rm->dtype;
 	for (i = dnew->nrows; i--; )
 	    for (j = dnew->ncols; j--; )
 		for (k = dnew->ncomp; k--; )
@@ -414,18 +502,79 @@ rmx_multiply(const RMATRIX *m1, const RMATRIX *m2)
 	mres = rmx_alloc(m1->nrows, m2->ncols, m1->ncomp);
 	if (mres == NULL)
 		return(NULL);
+	i = rmx_newtype(m1->dtype, m2->dtype);
+	if (i)
+		mres->dtype = i;
+	else
+		rmx_addinfo(mres, rmx_mismatch_warn);
 	for (i = mres->nrows; i--; )
 	    for (j = mres->ncols; j--; )
-	        for (h = m1->ncols; h--; ) {
+	        for (k = mres->ncomp; k--; ) {
 		    long double	d = 0;
-		    for (k = mres->ncomp; k--; )
-			d += (long double)rmx_lval(m1,i,h,k) *
-				(long double)rmx_lval(m2,h,j,k);
+		    for (h = m1->ncols; h--; )
+			d += rmx_lval(m1,i,h,k) * rmx_lval(m2,h,j,k);
 		    rmx_lval(mres,i,j,k) = (double)d;
 		}
 	return(mres);
 }
 
+/* Element-wise multiplication (or division) of m2 into m1 */
+int
+rmx_elemult(RMATRIX *m1, const RMATRIX *m2, int divide)
+{
+	int	zeroDivides = 0;
+	int	i, j, k;
+
+	if ((m1 == NULL) | (m2 == NULL) ||
+			(m1->ncols != m2->ncols) | (m1->nrows != m2->nrows))
+		return(0);
+	if ((m2->ncomp > 1) & (m2->ncomp != m1->ncomp))
+		return(0);
+	i = rmx_newtype(m1->dtype, m2->dtype);
+	if (i)
+		m1->dtype = i;
+	else
+		rmx_addinfo(m1, rmx_mismatch_warn);
+	for (i = m1->nrows; i--; )
+	    for (j = m1->ncols; j--; )
+		if (divide) {
+		    double	d;
+		    if (m2->ncomp == 1) {
+			d = rmx_lval(m2,i,j,0);
+			if (d == 0) {
+			    ++zeroDivides;
+			    for (k = m1->ncomp; k--; )
+				rmx_lval(m1,i,j,k) = 0;
+			} else {
+			    d = 1./d;
+			    for (k = m1->ncomp; k--; )
+				rmx_lval(m1,i,j,k) *= d;
+			}
+		    } else
+		        for (k = m1->ncomp; k--; ) {
+			    d = rmx_lval(m2,i,j,k);
+			    if (d == 0) {
+			        ++zeroDivides;
+				rmx_lval(m1,i,j,k) = 0;
+			    } else
+				rmx_lval(m1,i,j,k) /= d;
+			}
+		} else {
+		    if (m2->ncomp == 1) {
+			const double	d = rmx_lval(m2,i,j,0);
+		        for (k = m1->ncomp; k--; )
+			    rmx_lval(m1,i,j,k) *= d;
+		    } else
+		        for (k = m1->ncomp; k--; )
+			    rmx_lval(m1,i,j,k) *= rmx_lval(m2,i,j,k);
+		}
+	if (zeroDivides) {
+		fputs("Divide by zero in rmx_elemult()\n", stderr);
+		errno = ERANGE;
+	}
+	return(1);
+}
+
 /* Sum second matrix into first, applying scale factor beforehand */
 int
 rmx_sum(RMATRIX *msum, const RMATRIX *madd, const double sf[])
@@ -446,6 +595,11 @@ rmx_sum(RMATRIX *msum, const RMATRIX *madd, const doub
 			mysf[k] = 1;
 		sf = mysf;
 	}
+	i = rmx_newtype(msum->dtype, madd->dtype);
+	if (i)
+		msum->dtype = i;
+	else
+		rmx_addinfo(msum, rmx_mismatch_warn);
 	for (i = msum->nrows; i--; )
 	    for (j = msum->ncols; j--; )
 		for (k = msum->ncomp; k--; )
@@ -468,6 +622,8 @@ rmx_scale(RMATRIX *rm, const double sf[])
 		for (k = rm->ncomp; k--; )
 		    rmx_lval(rm,i,j,k) *= sf[k];
 
+	if (rm->info)
+		rmx_addinfo(rm, "Applied scalar\n");
 	return(1);
 }
 
@@ -483,6 +639,14 @@ rmx_transform(const RMATRIX *msrc, int n, const double
 	dnew = rmx_alloc(msrc->nrows, msrc->ncols, n);
 	if (dnew == NULL)
 		return(NULL);
+	if (msrc->info) {
+		char	buf[128];
+		sprintf(buf, "Applied %dx%d matrix transform\n",
+				dnew->ncomp, msrc->ncomp);
+		rmx_addinfo(dnew, msrc->info);
+		rmx_addinfo(dnew, buf);
+	}
+	dnew->dtype = msrc->dtype;
 	for (i = dnew->nrows; i--; )
 	    for (j = dnew->ncols; j--; )
 	        for (kd = dnew->ncomp; kd--; ) {
@@ -506,6 +670,7 @@ rmx_from_cmatrix(const CMATRIX *cm)
 	dnew = rmx_alloc(cm->nrows, cm->ncols, 3);
 	if (dnew == NULL)
 		return(NULL);
+	dnew->dtype = DTfloat;
 	for (i = dnew->nrows; i--; )
 	    for (j = dnew->ncols; j--; ) {
 		const COLORV	*cv = cm_lval(cm,i,j);