--- ray/src/util/radcompare.c 2019/08/14 18:20:02 2.20 +++ ray/src/util/radcompare.c 2023/11/21 20:01:39 2.34 @@ -1,5 +1,5 @@ #ifndef lint -static const char RCSid[] = "$Id: radcompare.c,v 2.20 2019/08/14 18:20:02 greg Exp $"; +static const char RCSid[] = "$Id: radcompare.c,v 2.34 2023/11/21 20:01:39 greg Exp $"; #endif /* * Compare Radiance files for significant differences @@ -27,6 +27,8 @@ int report = REP_WARN; /* reporting level */ int ign_header = 0; /* ignore header differences? */ +int escape_newlines = 0; /* allow backslash to skip newlines */ + double rel_min = 1e-5; /* positive for relative comparisons */ double rms_lim = 0.01; /* RMS difference limit */ @@ -35,6 +37,8 @@ double max_lim = 0.25; /* difference limit if non-neg int lin1cnt=0, lin2cnt=0; /* file line position */ +int comment_c = '\0'; /* comment delimiter for text files */ + const char nsuffix[10][3] = { /* 1st, 2nd, 3rd, etc. */ "th","st","nd","rd","th","th","th","th","th","th" }; @@ -47,6 +51,7 @@ const char *file_type[] = { "ascii", COLRFMT, CIEFMT, + SPECFMT, DEPTH16FMT, NORMAL32FMT, "float", @@ -61,7 +66,7 @@ const char *file_type[] = { NULL /* terminator */ }; /* keep consistent with above */ -enum {TYP_UNKNOWN, TYP_TEXT, TYP_ASCII, TYP_RGBE, TYP_XYZE, +enum {TYP_UNKNOWN, TYP_TEXT, TYP_ASCII, TYP_RGBE, TYP_XYZE, TYP_SPEC, TYP_DEPTH, TYP_NORM, TYP_FLOAT, TYP_DOUBLE, TYP_RBFMESH, TYP_OCTREE, TYP_TMESH, TYP_ID8, TYP_ID16, TYP_ID24, TYP_BINARY}; @@ -111,7 +116,7 @@ usage() { fputs("Usage: ", stderr); fputs(progname, stderr); - fputs(" [-h][-s|-w|-v][-rel min_test][-rms epsilon][-max epsilon] reference test\n", + fputs(" [-h][-c#][-s|-w|-v][-rel min_test][-rms epsilon][-max epsilon] reference test\n", stderr); exit(2); } @@ -130,8 +135,19 @@ read_line(LINEBUF *bp, FILE *fp) } while (fgets(bp->str + bp->len, bp->siz - bp->len, fp)) { bp->len += strlen(bp->str + bp->len); - if (bp->str[bp->len-1] == '\n') + if (bp->str[bp->len-1] == '\n') { + if (bp->len > 1 && bp->str[bp->len-2] == '\r') { + bp->str[--bp->len] = '\0'; + bp->str[bp->len-1] = '\n'; + } + if (escape_newlines && bp->len > 1 && + bp->str[bp->len-2] == '\\') { + bp->str[--bp->len] = '\0'; + bp->str[bp->len-1] = ' '; + continue; + } break; /* found EOL */ + } if (bp->len < bp->siz - 4) continue; /* at EOF? */ if (bp->siz >= MAXBUF) { @@ -149,6 +165,14 @@ read_line(LINEBUF *bp, FILE *fp) if (!bp->str) goto memerr; } + if (comment_c) { /* elide comment? */ + char *cp = sskip2(bp->str,0); + if (*cp == comment_c) { + *cp++ = '\n'; + *cp = '\0'; + bp->len = cp - bp->str; + } + } return(bp->len); memerr: fprintf(stderr, @@ -187,8 +211,9 @@ real_check(double r1, double r2) if (rel_min > 0) { /* doing relative differences? */ double av2 = .25*(r1*r1 + 2.*fabs(r1*r2) + r2*r2); - if (av2 > rel_min*rel_min) - diff2 /= av2; + if (av2 < rel_min*rel_min) + av2 = rel_min*rel_min; + diff2 /= av2; } if (max_lim >= 0 && diff2 > max_lim*max_lim) { if (report != REP_QUIET) @@ -220,16 +245,54 @@ color_check(COLOR c1, COLOR c2) return(real_check(colval(c1,p), colval(c2,p))); } +#if 1 +/* Compare two color spectra for equivalence */ +static int +spec_check(COLORV *sc1, COLORV *sc2) +{ + int p, k; + + if (!real_check(scolor_mean(sc1), scolor_mean(sc2))) + return(0); + + p = 0; /* find max. component */ + for (k = NCSAMP; --k; ) + if (sc1[k] > sc1[p]) + p = k; + + return(real_check(sc1[p], sc2[p])); +} +#else +/* Compare two color spectra for equivalence */ +static int +spec_check(COLORV *sc1, COLORV *sc2) +{ + COLOR c1, c2; + int p; + + if (!real_check(scolor_mean(sc1), scolor_mean(sc2))) + return(0); + /* do comparisons in RGB space */ + scolor_rgb(c1, sc1); + scolor_rgb(c2, sc2); + + p = (colval(c1,GRN) > colval(c1,RED)) ? GRN : RED; + if (colval(c1,BLU) > colval(c1,p)) p = BLU; + + return(real_check(colval(c1,p), colval(c2,p))); +} +#endif + /* Compare two normal directions for equivalence */ static int norm_check(FVECT nv1, FVECT nv2) { - double max2 = nv1[2]*nv1[2]; + double max2 = nv1[2]*nv2[2]; int imax = 2; int i = 2; /* identify largest component */ while (i--) { - double tm2 = nv1[i]*nv1[i]; + double tm2 = nv1[i]*nv2[i]; if (tm2 > max2) { imax = i; max2 = tm2; @@ -317,6 +380,7 @@ equiv_string(char *s1, char *s2) static int setheadvar(char *val, void *p) { + char newval[128]; LUTAB *htp = (LUTAB *)p; LUENT *tep; char *key; @@ -359,8 +423,13 @@ setheadvar(char *val, void *p) return(-1); /* memory allocation error */ if (!tep->key) tep->key = strcpy(malloc(kln+1), key); - if (tep->data) + if (tep->data) { /* check for special cases */ + if (!strcmp(key, "EXPOSURE")) { + sprintf(newval, "%.6e", atof(tep->data)*atof(val)); + vln = strlen(val = newval); + } free(tep->data); + } tep->data = strcpy(malloc(vln+1), val); return(1); } @@ -469,7 +538,6 @@ identify_type(const char *name, FILE *fin, LUTAB *htp) } if (c) return(TYP_BINARY); - SET_FILE_TEXT(fin); /* originally set to binary */ return(TYP_TEXT); badeof: if (report != REP_QUIET) { @@ -552,8 +620,18 @@ compare_text() if (report >= REP_VERBOSE) { fputs(progname, stdout); - fputs(": comparing inputs as ASCII text\n", stdout); + fputs(": comparing inputs as ASCII text", stdout); + if (escape_newlines) + fputs(", allowing escaped newlines", stdout); + if (comment_c) { + fputs(", ignoring comments starting with '", stdout); + fputc(comment_c, stdout); + fputc('\'', stdout); + } + fputc('\n', stdout); } + SET_FILE_TEXT(f1in); /* originally set to binary */ + SET_FILE_TEXT(f2in); init_line(&l1buf); init_line(&l2buf); /* compare a line at a time */ while (read_line(&l1buf, f1in)) { lin1cnt++; @@ -576,9 +654,12 @@ compare_text() /* compare non-empty lines */ if (!equiv_string(l1buf.str, l2buf.str)) { if (report != REP_QUIET) { - printf("%s: inputs '%s' and '%s' differ at line %d|%d\n", - progname, f1name, f2name, - lin1cnt, lin2cnt); + printf("%s: inputs '%s' and '%s' differ at line %d", + progname, f1name, f2name, lin1cnt); + if (lin1cnt != lin2cnt) + printf("|%d\n", lin2cnt); + else + putchar('\n'); if ( report >= REP_VERBOSE && (l1buf.len < 256) & (l2buf.len < 256) ) { @@ -608,6 +689,24 @@ compare_text() return(good_RMS()); /* final check for reals */ } +/* Set resolution based on NROWS, NCOLS in header */ +static int +set_resolu(RESOLU *rs, LUTAB *htp) +{ + const char *val; + + rs->rt = PIXSTANDARD; + val = (const char *)lu_find(htp, "NROWS")->data; + if (!val) return(0); + rs->yr = atoi(val); + if (rs->yr <= 0) return(-1); + val = (const char *)lu_find(htp, "NCOLS")->data; + if (!val) return(0); + rs->xr = atoi(val); + if (rs->xr <= 0) return(-1); + return(1); +} + /* Check image/map resolutions */ static int check_resolu(const char *class, RESOLU *r1p, RESOLU *r2p) @@ -665,8 +764,7 @@ compare_hdr() if (color_check(scan1[x], scan2[x])) continue; if (report != REP_QUIET) { - printf( - "%s: pixels at scanline %d offset %d differ\n", + printf("%s: pixels at scanline %d offset %d differ\n", progname, y, x); if (report >= REP_VERBOSE) { printf("%s: (R,G,B)=(%g,%g,%g)\n", @@ -689,6 +787,82 @@ compare_hdr() return(good_RMS()); /* final check of RMS */ } +/* Compare two inputs that are known to be spectral images */ +static int +compare_spec() +{ + static char NCstr[] = NCOMPSTR; + RESOLU rs1, rs2; + COLORV *scan1, *scan2; + const char *val; + int x, y; + + if (report >= REP_VERBOSE) { + fputs(progname, stdout); + fputs(": comparing inputs as spectral images\n", stdout); + } + if (!(set_resolu(&rs1, &hdr1) || fgetsresolu(&rs1, f1in))) + return(0); + if (!(set_resolu(&rs2, &hdr2) || fgetsresolu(&rs2, f2in))) + return(0); + if (!check_resolu("Spectral image", &rs1, &rs2)) + return(0); + NCstr[LNCOMPSTR-1] = '\0'; + val = (const char *)lu_find(&hdr1, NCstr)->data; + if (!val || (NCSAMP = atoi(val)) < 3) { + if (report != REP_QUIET) { + if (val) + printf("%s: illegal # components (%d) for spectral image\n", + progname, NCSAMP); + else + printf("%s: missing %s in header for spectral image\n", + progname, NCstr); + } + return(0); + } + scan1 = (COLORV *)malloc(sizeof(COLORV)*NCSAMP*scanlen(&rs1)); + scan2 = (COLORV *)malloc(sizeof(COLORV)*NCSAMP*scanlen(&rs2)); + if (!scan1 | !scan2) { + fprintf(stderr, "%s: out of memory in compare_hdr()\n", progname); + exit(2); + } + for (y = 0; y < numscans(&rs1); y++) { + if ((freadsscan(scan1, NCSAMP, scanlen(&rs1), f1in) < 0) | + (freadsscan(scan2, NCSAMP, scanlen(&rs2), f2in) < 0)) { + if (report != REP_QUIET) + printf("%s: unexpected end-of-file\n", progname); + free(scan1); + free(scan2); + return(0); + } + for (x = 0; x < scanlen(&rs1); x++) { + if (spec_check(scan1+x*NCSAMP, scan2+x*NCSAMP)) + continue; + if (report != REP_QUIET) { + int k; + printf("%s: spectra at scanline %d offset %d differ\n", + progname, y, x); + if (report >= REP_VERBOSE) { + printf("%s: spectrum =", f1name); + for (k = 0; k < NCSAMP; k++) + printf(" %g", scan1[x*NCSAMP+k]); + fputc('\n', stdout); + printf("%s: spectrum =", f2name); + for (k = 0; k < NCSAMP; k++) + printf(" %g", scan2[x*NCSAMP+k]); + fputc('\n', stdout); + } + } + free(scan1); + free(scan2); + return(0); + } + } + free(scan1); + free(scan2); + return(good_RMS()); /* final check of RMS */ +} + /* Set reference depth based on header variable */ static int set_refdepth(DEPTHCODEC *dcp, LUTAB *htp) @@ -696,7 +870,7 @@ set_refdepth(DEPTHCODEC *dcp, LUTAB *htp) static char depthvar[] = DEPTHSTR; const char *drval; - depthvar[LDEPTHSTR] = '\0'; + depthvar[LDEPTHSTR-1] = '\0'; drval = (const char *)lu_find(htp, depthvar)->data; if (!drval) return(0); @@ -893,6 +1067,12 @@ main(int argc, char *argv[]) case 'h': /* ignore header info. */ ign_header = !ign_header; continue; + case 'n': /* allow newline escapes */ + escape_newlines = !escape_newlines; + continue; + case 'c': /* ignore comments */ + comment_c = argv[a][2]; + continue; case 's': /* silent operation */ report = REP_QUIET; continue; @@ -953,7 +1133,7 @@ main(int argc, char *argv[]) return(2); if (typ1 != typ2) { if (report != REP_QUIET) - printf("%s: '%s' is %s and '%s' is %s\n", + printf("%s: '%s' format is %s and '%s' is %s\n", progname, f1name, file_type[typ1], f2name, file_type[typ2]); return(1); @@ -969,10 +1149,17 @@ main(int argc, char *argv[]) printf("%s: warning - unrecognized format\n", progname); } - if (report >= REP_VERBOSE) - printf("%s: input file type is %s\n", - progname, file_type[typ1]); - + if (report >= REP_VERBOSE) { + printf("%s: data format is %s\n", progname, file_type[typ1]); + if ((typ1 == TYP_FLOAT) | (typ1 == TYP_DOUBLE)) { + if (f1swap) + printf("%s: input '%s' is byte-swapped\n", + progname, f1name); + if (f2swap) + printf("%s: input '%s' is byte-swapped\n", + progname, f2name); + } + } switch (typ1) { /* compare based on type */ case TYP_BINARY: case TYP_TMESH: @@ -989,6 +1176,8 @@ main(int argc, char *argv[]) case TYP_RGBE: case TYP_XYZE: return( !compare_hdr() ); + case TYP_SPEC: + return( !compare_spec() ); case TYP_DEPTH: return( !compare_depth() ); case TYP_NORM: