From d6aeb7ce5870ac9a95e20a39660664a3f4e9d4be Mon Sep 17 00:00:00 2001 From: Cyrille Henry Date: Sat, 16 Feb 2013 14:10:59 +0000 Subject: bugfix svn path=/trunk/externals/pmpd/; revision=17036 --- pmpd3d_test.c | 635 +++++++++++++++++++++++++++++----------------------------- 1 file changed, 318 insertions(+), 317 deletions(-) (limited to 'pmpd3d_test.c') diff --git a/pmpd3d_test.c b/pmpd3d_test.c index 8aa3a5f..f90c3f3 100644 --- a/pmpd3d_test.c +++ b/pmpd3d_test.c @@ -1,183 +1,159 @@ int test_3d_mass(int i, t_pmpd3d *x, int argc, t_atom *argv) { - t_int tmp, tmp2; + t_float tmp, tmp2; t_int j = 1; while (j < argc) { - if (atom_getsymbolarg(j,argc,argv) == gensym("Id") ) - { - if ( x->mass[i].Id != atom_getsymbolarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if (atom_getsymbolarg(j,argc,argv) == gensym("posXSup") ) - { - if ( x->mass[i].posX < atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("posXInf") ) - { - if ( x->mass[i].posX >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if (atom_getsymbolarg(j,argc,argv) == gensym("posYSup") ) - { - if ( x->mass[i].posY < atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("posYInf") ) - { - if ( x->mass[i].posY >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if (atom_getsymbolarg(j,argc,argv) == gensym("posZSup") ) - { - if ( x->mass[i].posZ < atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("posZInf") ) - { - if ( x->mass[i].posZ >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("speedXSup") ) - { - if ( x->mass[i].speedX < atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("speedXInf") ) - { - if ( x->mass[i].speedX >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("speedYSup") ) - { - if ( x->mass[i].speedY < atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("speedYInf") ) - { - if ( x->mass[i].speedY >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("speedZSup") ) - { - if ( x->mass[i].speedZ < atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("speedZInf") ) - { - if ( x->mass[i].speedZ >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("speedSup") ) - { - tmp = x->mass[i].speedX * x->mass[i].speedX; - tmp += x->mass[i].speedY * x->mass[i].speedY; - tmp += x->mass[i].speedZ * x->mass[i].speedZ; - - if ( ( tmp < atom_getfloatarg(j+1,argc,argv)) * atom_getfloatarg(j+1,argc,argv) ) { return(0); } - - j+= 2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("speedInf") ) - { - tmp = x->mass[i].speedX * x->mass[i].speedX; - tmp += x->mass[i].speedY * x->mass[i].speedY; - tmp += x->mass[i].speedZ * x->mass[i].speedZ; - - if ( ( tmp >= atom_getfloatarg(j+1,argc,argv)) * atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if (atom_getsymbolarg(j,argc,argv) == gensym("distanceCircleInf")) - { - tmp = x->mass[i].posX - atom_getfloatarg(j+1,argc,argv); - tmp *= tmp; - tmp2 = x->mass[i].posY - atom_getfloatarg(j+2,argc,argv); - tmp = tmp + tmp2 * tmp2; - tmp2 = x->mass[i].posZ - atom_getfloatarg(j+3,argc,argv); - tmp = tmp + tmp2 * tmp2; - tmp2 = atom_getfloatarg(j+4,argc,argv); - - if ( tmp >= (tmp2 * tmp2) ) { return(0); } - j += 5; - } - else if (atom_getsymbolarg(j,argc,argv) == gensym("distanceCircleSup")) + if (argv[j].a_type != A_SYMBOL) { - tmp = x->mass[i].posX - atom_getfloatarg(j+1,argc,argv); - tmp *= tmp; - tmp2 = x->mass[i].posY - atom_getfloatarg(j+2,argc,argv); - tmp = tmp + tmp2 * tmp2; - tmp2 = x->mass[i].posZ - atom_getfloatarg(j+3,argc,argv); - tmp = tmp + tmp2 * tmp2; - tmp2 = atom_getfloatarg(j+4,argc,argv); - - if ( tmp < (tmp2 * tmp2) ) { return(0); } - j += 5; - } - else if (atom_getsymbolarg(j,argc,argv) == gensym("massSup")) - { - tmp = 1/ x->mass[i].invM; - if ( tmp < atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j += 2; - } - else if (atom_getsymbolarg(j,argc,argv) == gensym("massInf")) - { - tmp = 1/ x->mass[i].invM; - if ( tmp >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j += 2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("forceSup") ) - { - tmp = x->mass[i].forceX * x->mass[i].forceX; - tmp += x->mass[i].forceY * x->mass[i].forceY; - tmp += x->mass[i].forceZ * x->mass[i].forceZ; - - if ( ( tmp < atom_getfloatarg(j+1,argc,argv)) * atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+= 2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("forceInf") ) - { - tmp = x->mass[i].forceX * x->mass[i].forceX; - tmp += x->mass[i].forceY * x->mass[i].forceY; - tmp += x->mass[i].forceZ * x->mass[i].forceZ; - - if ( ( tmp >= atom_getfloatarg(j+1,argc,argv)) * atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+= 2; - } - else if (atom_getsymbolarg(j,argc,argv) == gensym("forceXSup") ) - { - if ( x->mass[i].forceX < atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if (atom_getsymbolarg(j,argc,argv) == gensym("forceXInf") ) - { - if ( x->mass[i].forceX >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if (atom_getsymbolarg(j,argc,argv) == gensym("forceYSup") ) - { - if ( x->mass[i].forceY < atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if (atom_getsymbolarg(j,argc,argv) == gensym("forceYInf") ) - { - if ( x->mass[i].forceY >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if (atom_getsymbolarg(j,argc,argv) == gensym("forceZSup") ) - { - if ( x->mass[i].forceZ < atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if (atom_getsymbolarg(j,argc,argv) == gensym("forceZInf") ) - { - if ( x->mass[i].forceZ >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; + j++; } else { - post("nor reconize %s",atom_getsymbolarg(j,argc,argv)); - j+=1; + if (atom_getsymbolarg(j,argc,argv) == gensym("Id") ) + { + if ( x->mass[i].Id != atom_getsymbolarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if (atom_getsymbolarg(j,argc,argv) == gensym("posXSup") ) + { + if ( x->mass[i].posX < atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("posXInf") ) + { + if ( x->mass[i].posX >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if (atom_getsymbolarg(j,argc,argv) == gensym("posYSup") ) + { + if ( x->mass[i].posY < atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("posYInf") ) + { + if ( x->mass[i].posY >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if (atom_getsymbolarg(j,argc,argv) == gensym("posZSup") ) + { + if ( x->mass[i].posZ < atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("posZInf") ) + { + if ( x->mass[i].posZ >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("speedXSup") ) + { + if ( x->mass[i].speedX < atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("speedXInf") ) + { + if ( x->mass[i].speedX >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("speedYSup") ) + { + if ( x->mass[i].speedY < atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("speedYInf") ) + { + if ( x->mass[i].speedY >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("speedZSup") ) + { + if ( x->mass[i].speedZ < atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("speedZInf") ) + { + if ( x->mass[i].speedZ >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("speedSup") ) + { + if ( sqrt(sqr(x->mass[i].speedX)+sqr(x->mass[i].speedY)+sqr(x->mass[i].speedZ)) < atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+= 2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("speedInf") ) + { + if ( sqrt(sqr(x->mass[i].speedX)+sqr(x->mass[i].speedY)+sqr(x->mass[i].speedZ)) >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if (atom_getsymbolarg(j,argc,argv) == gensym("distanceCircleInf")) + { + tmp = sqr(x->mass[i].posX - atom_getfloatarg(j+1,argc,argv))+sqr(x->mass[i].posY - atom_getfloatarg(j+2,argc,argv))+sqr(x->mass[i].posZ - atom_getfloatarg(j+3,argc,argv)); + if ( tmp >= sqr(atom_getfloatarg(j+4,argc,argv)) ) { return(0); } + j += 5; + } + else if (atom_getsymbolarg(j,argc,argv) == gensym("distanceCircleSup")) + { + tmp = sqr(x->mass[i].posX - atom_getfloatarg(j+1,argc,argv))+sqr(x->mass[i].posY - atom_getfloatarg(j+2,argc,argv))+sqr(x->mass[i].posZ - atom_getfloatarg(j+3,argc,argv)); + if ( tmp < sqr(atom_getfloatarg(j+4,argc,argv)) ) { return(0); } + j += 5; + } + else if (atom_getsymbolarg(j,argc,argv) == gensym("massSup")) + { + if ( 1/ x->mass[i].invM < atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j += 2; + } + else if (atom_getsymbolarg(j,argc,argv) == gensym("massInf")) + { + if ( 1/ x->mass[i].invM >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j += 2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("forceSup") ) + { + tmp = sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY) + sqr(x->mass[i].forceZ); + if ( ( tmp < atom_getfloatarg(j+1,argc,argv)) * atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+= 2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("forceInf") ) + { + tmp = sqr(x->mass[i].forceX) + sqr(x->mass[i].forceY) + sqr(x->mass[i].forceZ); + if ( ( tmp >= atom_getfloatarg(j+1,argc,argv)) * atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+= 2; + } + else if (atom_getsymbolarg(j,argc,argv) == gensym("forceXSup") ) + { + if ( x->mass[i].forceX < atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if (atom_getsymbolarg(j,argc,argv) == gensym("forceXInf") ) + { + if ( x->mass[i].forceX >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if (atom_getsymbolarg(j,argc,argv) == gensym("forceYSup") ) + { + if ( x->mass[i].forceY < atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if (atom_getsymbolarg(j,argc,argv) == gensym("forceYInf") ) + { + if ( x->mass[i].forceY >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if (atom_getsymbolarg(j,argc,argv) == gensym("forceZSup") ) + { + if ( x->mass[i].forceZ < atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if (atom_getsymbolarg(j,argc,argv) == gensym("forceZInf") ) + { + if ( x->mass[i].forceZ >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else + { + post("Option \"%s\" not reconized, stoping test",atom_getsymbolarg(j,argc,argv)->s_name); + return(-1); + } } } return(1); @@ -185,189 +161,192 @@ int test_3d_mass(int i, t_pmpd3d *x, int argc, t_atom *argv) int test_3d_link(int i, t_pmpd3d *x, int argc, t_atom *argv) { - t_int j, tmp, tmp2; + t_int j; + t_float tmp, tmp2; j = 1; - while (j < argc-1) + while (j < argc) { - if (atom_getsymbolarg(j,argc,argv) == gensym("Id") ) - { - if ( x->link[i].Id != atom_getsymbolarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if (atom_getsymbolarg(j,argc,argv) == gensym("forceXSup") ) - { - if ( x->link[i].forceX < atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; + if (argv[j].a_type != A_SYMBOL) + { + j++; } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("forceXInf") ) + else { - if ( x->link[i].forceX >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } + if (atom_getsymbolarg(j,argc,argv) == gensym("Id") ) + { + if ( x->link[i].Id != atom_getsymbolarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if (atom_getsymbolarg(j,argc,argv) == gensym("forceXSup") ) + { + if ( x->link[i].forceX < atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("forceXInf") ) + { + if ( x->link[i].forceX >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } else if (atom_getsymbolarg(j,argc,argv) == gensym("forceYSup") ) - { - if ( x->link[i].forceY < atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("forceYInf") ) - { - if ( x->link[i].forceY >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } + { + if ( x->link[i].forceY < atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("forceYInf") ) + { + if ( x->link[i].forceY >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } else if (atom_getsymbolarg(j,argc,argv) == gensym("forceZSup") ) - { - if ( x->link[i].forceZ < atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("forceZInf") ) - { - if ( x->link[i].forceZ >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } + { + if ( x->link[i].forceZ < atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("forceZInf") ) + { + if ( x->link[i].forceZ >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } else if (atom_getsymbolarg(j,argc,argv) == gensym("forceSup") ) - { - tmp = x->link[i].forceX; - tmp *= tmp; - tmp2 = x->link[i].forceY; - tmp = tmp + tmp2*tmp2; - tmp2 = x->link[i].forceZ; - tmp = tmp + tmp2*tmp2; - - tmp2 = atom_getfloatarg(j+1,argc,argv); - tmp2 *= tmp2; - - if ( tmp < tmp2 ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("forceInf") ) - { - tmp = x->link[i].forceX; - tmp = tmp * tmp; - tmp2 = x->link[i].forceY; - tmp = tmp + tmp2*tmp2; - tmp2 = x->link[i].forceZ; - tmp = tmp + tmp2*tmp2; - - tmp2 = atom_getfloatarg(j+1,argc,argv); - tmp2 *= tmp2; - - if ( tmp >= tmp2 ) { return(0); } - j+=2; - } + { + tmp = sqr(x->link[i].forceX) + sqr(x->link[i].forceY) + sqr(x->link[i].forceZ); + tmp2 = sqr(atom_getfloatarg(j+1,argc,argv)); + if ( tmp < tmp2 ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("forceInf") ) + { + tmp = sqr(x->link[i].forceX) + sqr(x->link[i].forceY) + sqr(x->link[i].forceZ); + tmp2 = sqr(atom_getfloatarg(j+1,argc,argv)); + if ( tmp >= tmp2 ) { return(0); } + j+=2; + } else if (atom_getsymbolarg(j,argc,argv) == gensym("lengthSup") ) - { - if ( x->link[i].distance < atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("lengthInf") ) - { - if ( x->link[i].distance >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("lengthXInf") ) - { - tmp = abs(x->link[i].mass1->posX - x->link[i].mass2->posX); - if ( tmp >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("lengthXSup") ) - { - tmp = abs(x->link[i].mass1->posX - x->link[i].mass2->posX); - if ( tmp < atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("lengthYInf") ) - { - tmp = abs(x->link[i].mass1->posY - x->link[i].mass2->posY); - if ( tmp >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("lengthYSup") ) - { - tmp = abs(x->link[i].mass1->posY - x->link[i].mass2->posY); - if ( tmp < atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("lengthZInf") ) - { - tmp = abs(x->link[i].mass1->posZ - x->link[i].mass2->posZ); - if ( tmp >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("lengthZSup") ) - { - tmp = abs(x->link[i].mass1->posZ - x->link[i].mass2->posZ); - if ( tmp < atom_getfloatarg(j+1,argc,argv) ) { return(0); } - j+=2; - } - else if ( atom_getsymbolarg(j,argc,argv) == gensym("connectedTo") ) - { - if (argv[j+1].a_type == A_SYMBOL) { - if (!( (x->link[i].mass1->Id == atom_getsymbolarg(j+1,argc,argv)) || (x->link[i].mass2->Id == atom_getsymbolarg(j+1,argc,argv)) )) - { return(0); } - j+=2; + if ( x->link[i].distance < atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("lengthInf") ) + { + if ( x->link[i].distance >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; } - else if (argv[j+1].a_type == A_FLOAT) + else if ( atom_getsymbolarg(j,argc,argv) == gensym("lengthXInf") ) { - if (!( (x->link[i].mass1->num == atom_getfloatarg(j+1,argc,argv)) || (x->link[i].mass2->num == atom_getfloatarg(j+1,argc,argv)) )) - { return(0); } + tmp = fabs(x->link[i].mass1->posX - x->link[i].mass2->posX); + if ( tmp >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } j+=2; } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("lengthXSup") ) + { + tmp = fabs(x->link[i].mass1->posX - x->link[i].mass2->posX); + if ( tmp < atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("lengthYInf") ) + { + tmp = fabs(x->link[i].mass1->posY - x->link[i].mass2->posY); + if ( tmp >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("lengthYSup") ) + { + tmp = fabs(x->link[i].mass1->posY - x->link[i].mass2->posY); + if ( tmp < atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("lengthZInf") ) + { + tmp = fabs(x->link[i].mass1->posZ - x->link[i].mass2->posZ); + if ( tmp >= atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("lengthZSup") ) + { + tmp = fabs(x->link[i].mass1->posZ - x->link[i].mass2->posZ); + if ( tmp < atom_getfloatarg(j+1,argc,argv) ) { return(0); } + j+=2; + } + else if ( atom_getsymbolarg(j,argc,argv) == gensym("connectedTo") ) + { + if (argv[j+1].a_type == A_SYMBOL) + { + if (!( (x->link[i].mass1->Id == atom_getsymbolarg(j+1,argc,argv)) || (x->link[i].mass2->Id == atom_getsymbolarg(j+1,argc,argv)) )) + { return(0); } + j+=2; + } + else if (argv[j+1].a_type == A_FLOAT) + { + if (!( (x->link[i].mass1->num == atom_getfloatarg(j+1,argc,argv)) || (x->link[i].mass2->num == atom_getfloatarg(j+1,argc,argv)) )) + { return(0); } + j+=2; + } + else + { + post("bad argument for connectedTo"); + j+=1; + } + } else { - post("bad argument for connectedTo"); - j+=1; + post("Option \"%s\" not reconized, stoping test",atom_getsymbolarg(j,argc,argv)->s_name); + return(-1); } } - else - { - post("nor reconize %s",atom_getsymbolarg(j,argc,argv)); - j+=1; - } } + return(1); } //---------------------------------------------------------------------- -void pmpd3d_testMass(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) +void pmpd3d_testLink(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) { - t_int i; + t_int i, tmp; t_atom std_out[2]; SETSYMBOL(&(std_out[0]),atom_getsymbolarg(0,argc,argv)); - for (i=0; i < x->nb_mass; i++) + for (i=0; i < x->nb_link; i++) { - if (test_3d_mass(i,x,argc,argv)) + tmp=test_3d_link(i,x,argc,argv); + if (tmp == -1) + { + break; + } + else if (tmp) { SETFLOAT(&(std_out[1]),i); - outlet_anything(x->main_outlet, gensym("testMass"),2,std_out); + outlet_anything(x->main_outlet, gensym("testLink"),2,std_out); } } } -void pmpd3d_testLink(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) +void pmpd3d_testMass(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) { - t_int i; + t_int i, tmp; t_atom std_out[2]; SETSYMBOL(&(std_out[0]),atom_getsymbolarg(0,argc,argv)); - for (i=0; i < x->nb_link; i++) + for (i=0; i < x->nb_mass; i++) { - if (test_3d_link(i,x,argc,argv)) + tmp=test_3d_mass(i,x,argc,argv); + if (tmp == -1) + { + break; + } + else if (tmp) { SETFLOAT(&(std_out[1]),i); - outlet_anything(x->main_outlet, gensym("testLink"),1,std_out); + outlet_anything(x->main_outlet, gensym("testMass"),2,std_out); } } } void pmpd3d_testLinkT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) { - int i, vecsize; + int i, vecsize, tmp; t_garray *a; t_word *vec; @@ -385,7 +364,12 @@ void pmpd3d_testLinkT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) for (i=0; i < taille_max; i++) { - vec[i].w_float = (t_float)test_3d_link(i,x,argc,argv); + tmp = test_3d_link(i,x,argc,argv); + if (tmp == -1) + { + break; + } + vec[i].w_float = (t_float)tmp; } garray_redraw(a); } @@ -394,7 +378,7 @@ void pmpd3d_testLinkT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) void pmpd3d_testMassT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) { - int i, vecsize; + int i, vecsize, tmp; t_garray *a; t_word *vec; @@ -412,7 +396,12 @@ void pmpd3d_testMassT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) for (i=0; i < taille_max; i++) { - vec[i].w_float = (t_float)test_3d_mass(i,x,argc,argv); + tmp = test_3d_mass(i,x,argc,argv); + if (tmp == -1) + { + break; + } + vec[i].w_float = (t_float)tmp; } garray_redraw(a); } @@ -421,26 +410,38 @@ void pmpd3d_testMassT(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) void pmpd3d_testLinkL(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) { - int i; + int i, tmp; t_atom list[x->nb_link+1]; - for (i=0; i < x->nb_link; i++) + for (i=0; i < x->nb_link;) { - SETFLOAT(&(list[i+1]), test_3d_link(i,x,argc,argv)); + tmp=test_3d_link(i,x,argc,argv); + if (tmp == -1) + { + break; + } + SETFLOAT(&(list[i+1]), (t_float)tmp); + i++; } SETSYMBOL(&(list[0]),atom_getsymbolarg(0,argc,argv)); - outlet_anything(x->main_outlet, gensym("testLink"),x->nb_link+1 , list); + outlet_anything(x->main_outlet, gensym("testLink"),i+1 , list); } void pmpd3d_testMassL(t_pmpd3d *x, t_symbol *s, int argc, t_atom *argv) { - int i; + int i, tmp; t_atom list[x->nb_mass+1]; - for (i=0; i < x->nb_mass; i++) - { - SETFLOAT(&(list[i+1]), test_3d_link(i,x,argc,argv)); + for (i=0; i < x->nb_mass;) + { + tmp=test_3d_mass(i,x,argc,argv); + if (tmp == -1) + { + break; + } + SETFLOAT(&(list[i+1]), (t_float)tmp); + i++; } SETSYMBOL(&(list[0]),atom_getsymbolarg(0,argc,argv)); - outlet_anything(x->main_outlet, gensym("testMass"),x->nb_mass+1 , list); + outlet_anything(x->main_outlet, gensym("testMass"),i+1 , list); } -- cgit v1.2.1