12 |
|
#include "resolu.h" |
13 |
|
#include "rmatrix.h" |
14 |
|
|
15 |
< |
typedef struct { |
16 |
< |
int nrows, ncols, ncomp; |
17 |
< |
int dtype; |
18 |
< |
} DMINFO; |
15 |
> |
static char rmx_mismatch_warn[] = "WARNING: data type mismatch\n"; |
16 |
|
|
17 |
|
/* Allocate a nr x nc matrix with n components */ |
18 |
|
RMATRIX * |
27 |
|
if (dnew == NULL) |
28 |
|
return(NULL); |
29 |
|
dnew->nrows = nr; dnew->ncols = nc; dnew->ncomp = n; |
30 |
+ |
dnew->dtype = DTdouble; |
31 |
+ |
dnew->info = NULL; |
32 |
|
return(dnew); |
33 |
|
} |
34 |
|
|
35 |
+ |
/* Free a RMATRIX array */ |
36 |
+ |
void |
37 |
+ |
rmx_free(RMATRIX *rm) |
38 |
+ |
{ |
39 |
+ |
if (!rm) return; |
40 |
+ |
if (rm->info) |
41 |
+ |
free(rm->info); |
42 |
+ |
free(rm); |
43 |
+ |
} |
44 |
+ |
|
45 |
+ |
/* Resolve data type based on two input types (returns 0 for mismatch) */ |
46 |
+ |
int |
47 |
+ |
rmx_newtype(int dtyp1, int dtyp2) |
48 |
+ |
{ |
49 |
+ |
if ((dtyp1==DTxyze) | (dtyp1==DTrgbe) && dtyp1 != dtyp2) |
50 |
+ |
return(0); |
51 |
+ |
if (dtyp1 < dtyp2) |
52 |
+ |
return(dtyp1); |
53 |
+ |
return(dtyp2); |
54 |
+ |
} |
55 |
+ |
|
56 |
+ |
/* Append header information associated with matrix data */ |
57 |
+ |
int |
58 |
+ |
rmx_addinfo(RMATRIX *rm, const char *info) |
59 |
+ |
{ |
60 |
+ |
if (!info || !*info) |
61 |
+ |
return(0); |
62 |
+ |
if (!rm->info) { |
63 |
+ |
rm->info = (char *)malloc(strlen(info)+1); |
64 |
+ |
if (rm->info) rm->info[0] = '\0'; |
65 |
+ |
} else |
66 |
+ |
rm->info = (char *)realloc(rm->info, |
67 |
+ |
strlen(rm->info)+strlen(info)+1); |
68 |
+ |
if (!rm->info) |
69 |
+ |
return(0); |
70 |
+ |
strcat(rm->info, info); |
71 |
+ |
return(1); |
72 |
+ |
} |
73 |
+ |
|
74 |
|
static int |
75 |
|
get_dminfo(char *s, void *p) |
76 |
|
{ |
77 |
< |
DMINFO *ip = (DMINFO *)p; |
78 |
< |
char fmt[32]; |
77 |
> |
RMATRIX *ip = (RMATRIX *)p; |
78 |
> |
char fmt[64]; |
79 |
|
int i; |
80 |
|
|
81 |
+ |
if (headidval(fmt, s)) |
82 |
+ |
return(0); |
83 |
|
if (!strncmp(s, "NCOMP=", 6)) { |
84 |
|
ip->ncomp = atoi(s+6); |
85 |
|
return(0); |
92 |
|
ip->ncols = atoi(s+6); |
93 |
|
return(0); |
94 |
|
} |
95 |
< |
if (!formatval(fmt, s)) |
95 |
> |
if (!formatval(fmt, s)) { |
96 |
> |
rmx_addinfo(ip, s); |
97 |
|
return(0); |
98 |
+ |
} |
99 |
|
for (i = 1; i < DTend; i++) |
100 |
|
if (!strcmp(fmt, cm_fmt_id[i])) { |
101 |
|
ip->dtype = i; |
187 |
|
rmx_load(const char *fname) |
188 |
|
{ |
189 |
|
FILE *fp = stdin; |
190 |
< |
DMINFO dinfo; |
190 |
> |
RMATRIX dinfo; |
191 |
|
RMATRIX *dnew; |
192 |
|
|
193 |
|
if (fname == NULL) { /* reading from stdin? */ |
194 |
|
fname = "<stdin>"; |
195 |
+ |
#ifdef _WIN32 |
196 |
+ |
_setmode(fileno(stdin), _O_BINARY); |
197 |
+ |
#endif |
198 |
|
} else { |
199 |
|
const char *sp = fname; /* check suffix */ |
200 |
|
while (*sp) |
217 |
|
flockfile(fp); |
218 |
|
#endif |
219 |
|
dinfo.nrows = dinfo.ncols = dinfo.ncomp = 0; |
220 |
< |
dinfo.dtype = DTascii; |
220 |
> |
dinfo.dtype = DTascii; /* assumed w/o FORMAT */ |
221 |
> |
dinfo.info = NULL; |
222 |
|
if (getheader(fp, get_dminfo, &dinfo) < 0) { |
223 |
|
fclose(fp); |
224 |
|
return(NULL); |
241 |
|
fclose(fp); |
242 |
|
return(NULL); |
243 |
|
} |
244 |
+ |
dnew->info = dinfo.info; |
245 |
|
switch (dinfo.dtype) { |
246 |
|
case DTascii: |
247 |
|
if (!rmx_load_ascii(dnew, fp)) |
248 |
|
goto loaderr; |
249 |
+ |
dnew->dtype = DTascii; /* should leave double? */ |
250 |
|
break; |
251 |
|
case DTfloat: |
252 |
|
if (!rmx_load_float(dnew, fp)) |
253 |
|
goto loaderr; |
254 |
+ |
dnew->dtype = DTfloat; |
255 |
|
break; |
256 |
|
case DTdouble: |
257 |
|
if (!rmx_load_double(dnew, fp)) |
258 |
|
goto loaderr; |
259 |
+ |
dnew->dtype = DTdouble; |
260 |
|
break; |
261 |
|
case DTrgbe: |
262 |
|
case DTxyze: |
263 |
|
if (!rmx_load_rgbe(dnew, fp)) |
264 |
|
goto loaderr; |
265 |
+ |
dnew->dtype = dinfo.dtype; |
266 |
|
break; |
267 |
|
default: |
268 |
|
goto loaderr; |
356 |
|
return(1); |
357 |
|
} |
358 |
|
|
359 |
< |
/* Write matrix to file type indicated by dt */ |
360 |
< |
long |
359 |
> |
/* Write matrix to file type indicated by dtype */ |
360 |
> |
int |
361 |
|
rmx_write(const RMATRIX *rm, int dtype, FILE *fp) |
362 |
|
{ |
363 |
|
RMATRIX *mydm = NULL; |
366 |
|
if ((rm == NULL) | (fp == NULL)) |
367 |
|
return(0); |
368 |
|
/* complete header */ |
369 |
+ |
if (rm->info) |
370 |
+ |
fputs(rm->info, fp); |
371 |
+ |
if (dtype == DTfromHeader) |
372 |
+ |
dtype = rm->dtype; |
373 |
+ |
else if ((dtype == DTrgbe) & (rm->dtype == DTxyze)) |
374 |
+ |
dtype = DTxyze; |
375 |
+ |
else if ((dtype == DTxyze) & (rm->dtype == DTrgbe)) |
376 |
+ |
dtype = DTrgbe; |
377 |
|
if ((dtype != DTrgbe) & (dtype != DTxyze)) { |
378 |
|
fprintf(fp, "NROWS=%d\n", rm->nrows); |
379 |
|
fprintf(fp, "NCOLS=%d\n", rm->ncols); |
410 |
|
} |
411 |
|
ok &= (fflush(fp) == 0); |
412 |
|
rmx_free(mydm); |
413 |
< |
return(ftell(fp) * ok); /* return # bytes written */ |
413 |
> |
return(ok); |
414 |
|
} |
415 |
|
|
416 |
|
/* Allocate and assign square identity matrix with n components */ |
418 |
|
rmx_identity(const int dim, const int n) |
419 |
|
{ |
420 |
|
RMATRIX *rid = rmx_alloc(dim, dim, n); |
421 |
< |
int i; |
421 |
> |
int i, k; |
422 |
|
|
423 |
|
if (rid == NULL) |
424 |
|
return(NULL); |
425 |
< |
memset(rid->mtx, 0, sizeof(rid->mtx[0])*dim*dim); |
425 |
> |
memset(rid->mtx, 0, sizeof(rid->mtx[0])*n*dim*dim); |
426 |
|
for (i = dim; i--; ) |
427 |
< |
rmx_lval(rid,i,i,0) = 1; |
428 |
< |
for (i = n; --i; ) |
370 |
< |
memcpy(rid->mtx+i*(dim*dim), rid->mtx, |
371 |
< |
sizeof(rid->mtx[0])*dim*dim); |
427 |
> |
for (k = n; k--; ) |
428 |
> |
rmx_lval(rid,i,i,k) = 1; |
429 |
|
return(rid); |
430 |
|
} |
431 |
|
|
440 |
|
dnew = rmx_alloc(rm->nrows, rm->ncols, rm->ncomp); |
441 |
|
if (dnew == NULL) |
442 |
|
return(NULL); |
443 |
+ |
rmx_addinfo(dnew, rm->info); |
444 |
+ |
dnew->dtype = rm->dtype; |
445 |
|
memcpy(dnew->mtx, rm->mtx, |
446 |
|
sizeof(rm->mtx[0])*rm->ncomp*rm->nrows*rm->ncols); |
447 |
|
return(dnew); |
459 |
|
dnew = rmx_alloc(rm->ncols, rm->nrows, rm->ncomp); |
460 |
|
if (dnew == NULL) |
461 |
|
return(NULL); |
462 |
+ |
if (rm->info) { |
463 |
+ |
rmx_addinfo(dnew, rm->info); |
464 |
+ |
rmx_addinfo(dnew, "Transposed rows and columns\n"); |
465 |
+ |
} |
466 |
+ |
dnew->dtype = rm->dtype; |
467 |
|
for (i = dnew->nrows; i--; ) |
468 |
|
for (j = dnew->ncols; j--; ) |
469 |
|
for (k = dnew->ncomp; k--; ) |
484 |
|
mres = rmx_alloc(m1->nrows, m2->ncols, m1->ncomp); |
485 |
|
if (mres == NULL) |
486 |
|
return(NULL); |
487 |
+ |
i = rmx_newtype(m1->dtype, m2->dtype); |
488 |
+ |
if (i) |
489 |
+ |
mres->dtype = i; |
490 |
+ |
else |
491 |
+ |
rmx_addinfo(mres, rmx_mismatch_warn); |
492 |
|
for (i = mres->nrows; i--; ) |
493 |
|
for (j = mres->ncols; j--; ) |
494 |
< |
for (h = m1->ncols; h--; ) { |
494 |
> |
for (k = mres->ncomp; k--; ) { |
495 |
|
long double d = 0; |
496 |
< |
for (k = mres->ncomp; k--; ) |
496 |
> |
for (h = m1->ncols; h--; ) |
497 |
|
d += (long double)rmx_lval(m1,i,h,k) * |
498 |
|
(long double)rmx_lval(m2,h,j,k); |
499 |
|
rmx_lval(mres,i,j,k) = (double)d; |
521 |
|
mysf[k] = 1; |
522 |
|
sf = mysf; |
523 |
|
} |
524 |
+ |
i = rmx_newtype(msum->dtype, madd->dtype); |
525 |
+ |
if (i) |
526 |
+ |
msum->dtype = i; |
527 |
+ |
else |
528 |
+ |
rmx_addinfo(msum, rmx_mismatch_warn); |
529 |
|
for (i = msum->nrows; i--; ) |
530 |
|
for (j = msum->ncols; j--; ) |
531 |
|
for (k = msum->ncomp; k--; ) |
563 |
|
dnew = rmx_alloc(msrc->nrows, msrc->ncols, n); |
564 |
|
if (dnew == NULL) |
565 |
|
return(NULL); |
566 |
+ |
dnew->dtype = msrc->dtype; |
567 |
|
for (i = dnew->nrows; i--; ) |
568 |
|
for (j = dnew->ncols; j--; ) |
569 |
|
for (kd = dnew->ncomp; kd--; ) { |
587 |
|
dnew = rmx_alloc(cm->nrows, cm->ncols, 3); |
588 |
|
if (dnew == NULL) |
589 |
|
return(NULL); |
590 |
+ |
dnew->dtype = DTfloat; |
591 |
|
for (i = dnew->nrows; i--; ) |
592 |
|
for (j = dnew->ncols; j--; ) { |
593 |
|
const COLORV *cv = cm_lval(cm,i,j); |