27 |
|
|
28 |
|
int ign_header = 0; /* ignore header differences? */ |
29 |
|
|
30 |
+ |
int escape_newlines = 0; /* allow backslash to skip newlines */ |
31 |
+ |
|
32 |
|
double rel_min = 1e-5; /* positive for relative comparisons */ |
33 |
|
|
34 |
|
double rms_lim = 0.01; /* RMS difference limit */ |
37 |
|
|
38 |
|
int lin1cnt=0, lin2cnt=0; /* file line position */ |
39 |
|
|
40 |
+ |
int comment_c = '\0'; /* comment delimiter for text files */ |
41 |
+ |
|
42 |
|
const char nsuffix[10][3] = { /* 1st, 2nd, 3rd, etc. */ |
43 |
|
"th","st","nd","rd","th","th","th","th","th","th" |
44 |
|
}; |
103 |
|
const char stdin_name[] = "<stdin>"; |
104 |
|
const char *f1name=NULL, *f2name=NULL; |
105 |
|
FILE *f1in=NULL, *f2in=NULL; |
106 |
+ |
int f1swap=0, f2swap=0; |
107 |
|
|
108 |
|
/* running real differences */ |
109 |
|
double diff2sum = 0; |
115 |
|
{ |
116 |
|
fputs("Usage: ", stderr); |
117 |
|
fputs(progname, stderr); |
118 |
< |
fputs(" [-h][-s|-w|-v][-rel min_test][-rms epsilon][-max epsilon] reference test\n", |
118 |
> |
fputs(" [-h][-c#][-s|-w|-v][-rel min_test][-rms epsilon][-max epsilon] reference test\n", |
119 |
|
stderr); |
120 |
|
exit(2); |
121 |
|
} |
134 |
|
} |
135 |
|
while (fgets(bp->str + bp->len, bp->siz - bp->len, fp)) { |
136 |
|
bp->len += strlen(bp->str + bp->len); |
137 |
< |
if (bp->str[bp->len-1] == '\n') |
137 |
> |
if (bp->str[bp->len-1] == '\n') { |
138 |
> |
if (bp->len > 1 && bp->str[bp->len-2] == '\r') { |
139 |
> |
bp->str[--bp->len] = '\0'; |
140 |
> |
bp->str[bp->len-1] = '\n'; |
141 |
> |
} |
142 |
> |
if (escape_newlines && bp->len > 1 && |
143 |
> |
bp->str[bp->len-2] == '\\') { |
144 |
> |
bp->str[--bp->len] = '\0'; |
145 |
> |
bp->str[bp->len-1] = ' '; |
146 |
> |
continue; |
147 |
> |
} |
148 |
|
break; /* found EOL */ |
149 |
+ |
} |
150 |
|
if (bp->len < bp->siz - 4) |
151 |
|
continue; /* at EOF? */ |
152 |
|
if (bp->siz >= MAXBUF) { |
164 |
|
if (!bp->str) |
165 |
|
goto memerr; |
166 |
|
} |
167 |
+ |
if (comment_c) { /* elide comment? */ |
168 |
+ |
char *cp = sskip2(bp->str,0); |
169 |
+ |
if (*cp == comment_c) { |
170 |
+ |
*cp++ = '\n'; |
171 |
+ |
*cp = '\0'; |
172 |
+ |
bp->len = cp - bp->str; |
173 |
+ |
} |
174 |
+ |
} |
175 |
|
return(bp->len); |
176 |
|
memerr: |
177 |
|
fprintf(stderr, |
210 |
|
|
211 |
|
if (rel_min > 0) { /* doing relative differences? */ |
212 |
|
double av2 = .25*(r1*r1 + 2.*fabs(r1*r2) + r2*r2); |
213 |
< |
if (av2 > rel_min*rel_min) |
214 |
< |
diff2 /= av2; |
213 |
> |
if (av2 < rel_min*rel_min) |
214 |
> |
av2 = rel_min*rel_min; |
215 |
> |
diff2 /= av2; |
216 |
|
} |
217 |
|
if (max_lim >= 0 && diff2 > max_lim*max_lim) { |
218 |
|
if (report != REP_QUIET) |
248 |
|
static int |
249 |
|
norm_check(FVECT nv1, FVECT nv2) |
250 |
|
{ |
251 |
< |
double max2 = nv1[2]*nv1[2]; |
251 |
> |
double max2 = nv1[2]*nv2[2]; |
252 |
|
int imax = 2; |
253 |
|
int i = 2; |
254 |
|
/* identify largest component */ |
255 |
|
while (i--) { |
256 |
< |
double tm2 = nv1[i]*nv1[i]; |
256 |
> |
double tm2 = nv1[i]*nv2[i]; |
257 |
|
if (tm2 > max2) { |
258 |
|
imax = i; |
259 |
|
max2 = tm2; |
341 |
|
static int |
342 |
|
setheadvar(char *val, void *p) |
343 |
|
{ |
344 |
+ |
char newval[128]; |
345 |
|
LUTAB *htp = (LUTAB *)p; |
346 |
|
LUENT *tep; |
347 |
|
char *key; |
351 |
|
adv_linecnt(htp); /* side-effect is to count lines */ |
352 |
|
if (!isalpha(*val)) /* key must start line */ |
353 |
|
return(0); |
354 |
+ |
/* check if we need to swap binary data */ |
355 |
+ |
if ((n = isbigendian(val)) >= 0) { |
356 |
+ |
if (nativebigendian() == n) |
357 |
+ |
return(0); |
358 |
+ |
f1swap += (htp == &hdr1); |
359 |
+ |
f2swap += (htp == &hdr2); |
360 |
+ |
return(0); |
361 |
+ |
} |
362 |
|
key = val++; |
363 |
|
while (*val && !isspace(*val) & (*val != '=')) |
364 |
|
val++; |
384 |
|
return(-1); /* memory allocation error */ |
385 |
|
if (!tep->key) |
386 |
|
tep->key = strcpy(malloc(kln+1), key); |
387 |
< |
if (tep->data) |
387 |
> |
if (tep->data) { /* check for special cases */ |
388 |
> |
if (!strcmp(key, "EXPOSURE")) { |
389 |
> |
sprintf(newval, "%.6e", atof(tep->data)*atof(val)); |
390 |
> |
vln = strlen(val = newval); |
391 |
> |
} |
392 |
|
free(tep->data); |
393 |
+ |
} |
394 |
|
tep->data = strcpy(malloc(vln+1), val); |
395 |
|
return(1); |
396 |
|
} |
499 |
|
} |
500 |
|
if (c) |
501 |
|
return(TYP_BINARY); |
463 |
– |
SET_FILE_TEXT(fin); /* originally set to binary */ |
502 |
|
return(TYP_TEXT); |
503 |
|
badeof: |
504 |
|
if (report != REP_QUIET) { |
581 |
|
|
582 |
|
if (report >= REP_VERBOSE) { |
583 |
|
fputs(progname, stdout); |
584 |
< |
fputs(": comparing inputs as ASCII text\n", stdout); |
584 |
> |
fputs(": comparing inputs as ASCII text", stdout); |
585 |
> |
if (escape_newlines) |
586 |
> |
fputs(", allowing escaped newlines", stdout); |
587 |
> |
if (comment_c) { |
588 |
> |
fputs(", ignoring comments starting with '", stdout); |
589 |
> |
fputc(comment_c, stdout); |
590 |
> |
fputc('\'', stdout); |
591 |
> |
} |
592 |
> |
fputc('\n', stdout); |
593 |
|
} |
594 |
+ |
SET_FILE_TEXT(f1in); /* originally set to binary */ |
595 |
+ |
SET_FILE_TEXT(f2in); |
596 |
|
init_line(&l1buf); init_line(&l2buf); /* compare a line at a time */ |
597 |
|
while (read_line(&l1buf, f1in)) { |
598 |
|
lin1cnt++; |
615 |
|
/* compare non-empty lines */ |
616 |
|
if (!equiv_string(l1buf.str, l2buf.str)) { |
617 |
|
if (report != REP_QUIET) { |
618 |
< |
printf("%s: inputs '%s' and '%s' differ at line %d|%d\n", |
619 |
< |
progname, f1name, f2name, |
620 |
< |
lin1cnt, lin2cnt); |
618 |
> |
printf("%s: inputs '%s' and '%s' differ at line %d", |
619 |
> |
progname, f1name, f2name, lin1cnt); |
620 |
> |
if (lin1cnt != lin2cnt) |
621 |
> |
printf("|%d\n", lin2cnt); |
622 |
> |
else |
623 |
> |
putchar('\n'); |
624 |
|
if ( report >= REP_VERBOSE && |
625 |
|
(l1buf.len < 256) & |
626 |
|
(l2buf.len < 256) ) { |
738 |
|
static char depthvar[] = DEPTHSTR; |
739 |
|
const char *drval; |
740 |
|
|
741 |
< |
depthvar[LDEPTHSTR] = '\0'; |
741 |
> |
depthvar[LDEPTHSTR-1] = '\0'; |
742 |
|
drval = (const char *)lu_find(htp, depthvar)->data; |
743 |
|
if (!drval) |
744 |
|
return(0); |
873 |
|
if (!getbinary(&f2, sizeof(f2), 1, f2in)) |
874 |
|
goto badeof; |
875 |
|
++nread; |
876 |
+ |
if (f1swap) swap32((char *)&f1, 1); |
877 |
+ |
if (f2swap) swap32((char *)&f2, 1); |
878 |
|
if (real_check(f1, f2)) |
879 |
|
continue; |
880 |
|
if (report != REP_QUIET) |
905 |
|
if (!getbinary(&f2, sizeof(f2), 1, f2in)) |
906 |
|
goto badeof; |
907 |
|
++nread; |
908 |
+ |
if (f1swap) swap64((char *)&f1, 1); |
909 |
+ |
if (f2swap) swap64((char *)&f2, 1); |
910 |
|
if (real_check(f1, f2)) |
911 |
|
continue; |
912 |
|
if (report != REP_QUIET) |
935 |
|
case 'h': /* ignore header info. */ |
936 |
|
ign_header = !ign_header; |
937 |
|
continue; |
938 |
+ |
case 'n': /* allow newline escapes */ |
939 |
+ |
escape_newlines = !escape_newlines; |
940 |
+ |
continue; |
941 |
+ |
case 'c': /* ignore comments */ |
942 |
+ |
comment_c = argv[a][2]; |
943 |
+ |
continue; |
944 |
|
case 's': /* silent operation */ |
945 |
|
report = REP_QUIET; |
946 |
|
continue; |
1001 |
|
return(2); |
1002 |
|
if (typ1 != typ2) { |
1003 |
|
if (report != REP_QUIET) |
1004 |
< |
printf("%s: '%s' is %s and '%s' is %s\n", |
1004 |
> |
printf("%s: '%s' format is %s and '%s' is %s\n", |
1005 |
|
progname, f1name, file_type[typ1], |
1006 |
|
f2name, file_type[typ2]); |
1007 |
|
return(1); |
1017 |
|
printf("%s: warning - unrecognized format\n", |
1018 |
|
progname); |
1019 |
|
} |
1020 |
< |
if (report >= REP_VERBOSE) |
1021 |
< |
printf("%s: input file type is %s\n", |
1022 |
< |
progname, file_type[typ1]); |
1023 |
< |
|
1020 |
> |
if (report >= REP_VERBOSE) { |
1021 |
> |
printf("%s: data format is %s\n", progname, file_type[typ1]); |
1022 |
> |
if ((typ1 == TYP_FLOAT) | (typ1 == TYP_DOUBLE)) { |
1023 |
> |
if (f1swap) |
1024 |
> |
printf("%s: input '%s' is byte-swapped\n", |
1025 |
> |
progname, f1name); |
1026 |
> |
if (f2swap) |
1027 |
> |
printf("%s: input '%s' is byte-swapped\n", |
1028 |
> |
progname, f2name); |
1029 |
> |
} |
1030 |
> |
} |
1031 |
|
switch (typ1) { /* compare based on type */ |
1032 |
|
case TYP_BINARY: |
1033 |
|
case TYP_TMESH: |