code refactorisation, and few new fonctionalities copied from pmpd3d

svn path=/trunk/externals/pmpd/; revision=17073

1 files changed, 396 insertions, 0 deletions

diff --git a/pmpd2d_test.c b/pmpd2d_test.c
new file mode 100644
index 0000000..24044d0
--- /dev/null
+++ b/pmpd2d_test.c
@@ -0,0 +1,396 @@
+int test_2d_mass(int i, t_pmpd2d *x, int argc, t_atom *argv)
+{
+	t_float tmp, tmp2;
+	t_int j = 1;
+	while (j < argc) 
+	{
+		if (argv[j].a_type != A_SYMBOL) 
+		{ 
+			j++;
+		}
+		else
+		{
+			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("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("speedSup") )
+			{
+				if ( sqrt(sqr(x->mass[i].speedX)+sqr(x->mass[i].speedY)) < 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)) >= 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));
+				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));
+				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) ;
+				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) ;
+				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
+			{
+				post("Option \"%s\" not reconized, stoping test",atom_getsymbolarg(j,argc,argv)->s_name);
+				return(-1);
+			}
+		}
+	}
+	return(1);	
+}
+
+int test_2d_link(int i, t_pmpd2d *x, int argc, t_atom *argv)
+{
+	t_int j;
+	t_float tmp, tmp2;
+	j = 1;
+	
+	while (j < argc) 
+	{
+		if (argv[j].a_type != A_SYMBOL) 
+		{ 
+			j++;
+		}
+		else
+		{
+			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;
+			}
+			else if (atom_getsymbolarg(j,argc,argv) == gensym("forceSup") )
+			{
+				tmp = sqr(x->link[i].forceX) + sqr(x->link[i].forceY);
+				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);
+				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 = 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("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("Option \"%s\" not reconized, stoping test",atom_getsymbolarg(j,argc,argv)->s_name);
+				return(-1);
+			}
+		}
+	}
+	return(1);
+}
+
+//----------------------------------------------------------------------
+
+void pmpd2d_testLink(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
+{
+	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++)
+	{
+		tmp=test_2d_link(i,x,argc,argv);
+		if (tmp == -1)
+		{	
+			break;
+		}
+		else if (tmp)
+		{
+			SETFLOAT(&(std_out[1]),i);
+			outlet_anything(x->main_outlet, gensym("testLink"),2,std_out);
+		}
+	}
+}
+
+void pmpd2d_testMass(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
+{
+	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++)
+	{
+		tmp=test_2d_mass(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);
+		}
+	}
+}
+
+void pmpd2d_testLinkT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
+{
+    int i, vecsize, tmp;
+    t_garray *a;
+    t_word *vec;
+    
+    if (argv[0].a_type == A_SYMBOL)
+    {
+        t_symbol *tab_name = atom_getsymbolarg(0, argc, argv);
+        if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class)))
+            pd_error(x, "%s: no such array", tab_name->s_name);
+        else if (!garray_getfloatwords(a, &vecsize, &vec))
+            pd_error(x, "%s: bad template for tabwrite", tab_name->s_name);
+        else
+        {
+			int taille_max = x->nb_link;
+            taille_max = min(taille_max, vecsize);
+            
+            for (i=0; i < taille_max; i++)
+            {
+				tmp = test_2d_link(i,x,argc,argv);
+				if (tmp == -1)
+				{	
+					break;
+				}
+				vec[i].w_float = (t_float)tmp;
+            }
+            garray_redraw(a);
+        }
+    }
+}
+
+void pmpd2d_testMassT(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
+{
+    int i, vecsize, tmp;
+    t_garray *a;
+    t_word *vec;
+    
+    if (argv[0].a_type == A_SYMBOL)
+    {
+        t_symbol *tab_name = atom_getsymbolarg(0, argc, argv);
+        if (!(a = (t_garray *)pd_findbyclass(tab_name, garray_class)))
+            pd_error(x, "%s: no such array", tab_name->s_name);
+        else if (!garray_getfloatwords(a, &vecsize, &vec))
+            pd_error(x, "%s: bad template for tabwrite", tab_name->s_name);
+        else
+        {
+			int taille_max = x->nb_mass;
+            taille_max = min(taille_max, vecsize);
+            
+            for (i=0; i < taille_max; i++)
+            {
+				tmp = test_2d_mass(i,x,argc,argv);
+				if (tmp == -1)
+				{
+					break;
+				}
+				vec[i].w_float = (t_float)tmp;
+            }
+            garray_redraw(a);
+        }
+    }
+}
+
+void pmpd2d_testLinkL(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
+{
+    int i, tmp;
+    t_atom list[x->nb_link+1];
+
+    for (i=0; i < x->nb_link;)
+	{
+		tmp=test_2d_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"),i+1 , list);
+}
+
+void pmpd2d_testMassL(t_pmpd2d *x, t_symbol *s, int argc, t_atom *argv)
+{
+    int i, tmp;
+    t_atom list[x->nb_mass+1];
+
+    for (i=0; i < x->nb_mass;)
+	{		
+		tmp=test_2d_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"),i+1 , list);
+}
+