|
From: <kin...@us...> - 2004-03-01 10:30:40
|
Update of /cvsroot/teem/teem/src/ell/test In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1922/ell/test Modified Files: invert.c Log Message: ell's storage of matrices is now row-major instead of column major. Debugging in progress Index: invert.c =================================================================== RCS file: /cvsroot/teem/teem/src/ell/test/invert.c,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** invert.c 7 Jan 2004 15:34:29 -0000 1.4 --- invert.c 1 Mar 2004 10:19:45 -0000 1.5 *************** *** 20,24 **** #include "../ell.h" ! char *invInfo = "Tests ell_Nm_inv and ell_Nm_pseudo_inv"; int --- 20,25 ---- #include "../ell.h" ! char *invInfo = ("Tests ell_Nm_inv and ell_Nm_pseudo_inv, " ! "and ell_{3,4}inv_d where possible "); int *************** *** 31,34 **** --- 32,36 ---- int (*func)(Nrrd *, Nrrd *); + double m3[9], m4[16]; me = argv[0]; mop = airMopNew(); *************** *** 54,57 **** --- 56,73 ---- nrrdConvert(nmat, nin, nrrdTypeDouble); + if (3 == nmat->axis[0].size && 3 == nmat->axis[1].size) { + ell_3m_inv_d(m3, nmat->data); + fprintf(stderr, "%s: input:\n", me); + ell_3m_print_d(stderr, nmat->data); + fprintf(stderr, "%s: inverse:\n", me); + ell_3m_print_d(stderr, m3); + } + if (4 == nmat->axis[0].size && 4 == nmat->axis[1].size) { + ell_4m_inv_d(m4, nmat->data); + fprintf(stderr, "%s: input:\n", me); + ell_4m_print_d(stderr, nmat->data); + fprintf(stderr, "%s: inverse:\n", me); + ell_4m_print_d(stderr, m4); + } func = (nmat->axis[0].size == nmat->axis[1].size ? ell_Nm_inv |