| 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)) |
| 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; ) |
| 428 |
< |
memcpy(rid->mtx+i*(dim*dim), rid->mtx, |
| 429 |
< |
sizeof(rid->mtx[0])*dim*dim); |
| 427 |
> |
for (k = n; k--; ) |
| 428 |
> |
rmx_lval(rid,i,i,k) = 1; |
| 429 |
|
return(rid); |
| 430 |
|
} |
| 431 |
|
|
