MSD version 0.05

svn path=/trunk/externals/nusmuk/; revision=2846

1 files changed, 186 insertions, 158 deletions

diff --git a/msd/main.cpp b/msd/main.cpp
index f74ba3d..28b3276 100755
--- a/msd/main.cpp
+++ b/msd/main.cpp
@@ -30,7 +30,7 @@
  License along with this library; if not, write to the Free Software
  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 
- Version 0.04 -- 26.04.2005
+ Version 0.05 -- 28.04.2005
 */
 
 // include flext header
@@ -38,7 +38,7 @@
 #include <math.h>
 
 // define constants
-#define MSD_VERSION  0.04
+#define MSD_VERSION  0.05
 #define nb_max_link   4000
 #define nb_max_mass   4000
 #define Id_length   20
@@ -112,13 +112,14 @@ protected:
 	void m_reset() 
 	{ 
 		t_int i;
-//		t_atom sortie;
+		t_mass **mi;
+		t_link **li;
 
-		for (i=0; i<nb_mass; i++)	{
-			delete mass[i];
+		for (i=0, mi=mass; i<nb_mass; mi++, i++)	{
+			delete (*mi);
 			}
-		for (i=0; i<nb_link; i++)	{
-			delete link[i];
+		for (i=0, li=link; i<nb_link; li++,i++)	{
+			delete (*li);
 			}
 		ToOutAnything(1,S_Reset,0,NULL);
 		nb_link = 0;
@@ -134,45 +135,43 @@ protected:
 	{
 		t_float F=0,Fx=0,distance,vitesse, X_new;
 		t_int i;
-		struct _mass mass_1, mass_2;
+		t_mass **mi;
+		t_link **li;
 
 
-
-		for (i=0; i<nb_link; i++)	{
+		for (i=0, li=link; i<nb_link; li++,i++)	{
 		// compute link forces
-			distance = link[i]->mass1->posX-link[i]->mass2->posX;		// L[n] = x1 - x2
+			distance = (*li)->mass1->posX-(*li)->mass2->posX;		// L[n] = x1 - x2
 			if (distance < 0)
 				distance = -distance;					// |L[n]|
-			if (distance < link[i]->long_min || distance > link[i]->long_max)	
+			if (distance < (*li)->long_min || distance > (*li)->long_max)	
 				Fx = 0;
 			else 	{								// Lmin < L < Lmax
-				F  = link[i]->K1 * (distance - link[i]->longueur) ;		// F[n] = k1 (L[n] - L[0])
-				F += link[i]->D1 * (distance - link[i]->distance_old) ;		// F[n] = F[n] + D1 (L[n] - L[n-1])
+				F  = (*li)->K1 * (distance - (*li)->longueur) ;		// F[n] = k1 (L[n] - L[0])
+				F += (*li)->D1 * (distance - (*li)->distance_old) ;		// F[n] = F[n] + D1 (L[n] - L[n-1])
 				if (distance != 0) 	
-					Fx = F * (link[i]->mass1->posX - link[i]->mass2->posX)/distance; // Fx = F * Lx[n]/L[n]
+					Fx = F * ((*li)->mass1->posX - (*li)->mass2->posX)/distance; // Fx = F * Lx[n]/L[n]
 			}
-				link[i]->mass1->forceX -= Fx;					// Fx1[n] = -Fx
-				link[i]->mass1->forceX -= link[i]->D2*link[i]->mass1->speedX; 	// Fx1[n] = Fx1[n] - D2 * vx1[n-1]
-				link[i]->mass2->forceX += Fx;					// Fx2[n] = Fx
-				link[i]->mass2->forceX -= link[i]->D2*link[i]->mass2->speedX; 	// Fx2[n] = Fx2[n] - D2 * vx2[n-1]
-				link[i]->distance_old = distance;				// L[n-1] = L[n]			
+				(*li)->mass1->forceX -= Fx;					// Fx1[n] = -Fx
+				(*li)->mass1->forceX -= (*li)->D2*(*li)->mass1->speedX; 	// Fx1[n] = Fx1[n] - D2 * vx1[n-1]
+				(*li)->mass2->forceX += Fx;					// Fx2[n] = Fx
+				(*li)->mass2->forceX -= (*li)->D2*(*li)->mass2->speedX; 	// Fx2[n] = Fx2[n] - D2 * vx2[n-1]
+				(*li)->distance_old = distance;				// L[n-1] = L[n]			
 		}
 
-
-
-		for (i=0; i<nb_mass; i++)
+		for (i=0, mi=mass; i<nb_mass; mi++, i++)
 		// compute new masses position only if mobile = 1
-			if (mass[i]->mobile == 1)  		{
-				X_new = mass[i]->forceX * mass[i]->invM + 2*mass[i]->posX - mass[i]->posX2; // x[n] =Fx[n]/M+2x[n]-x[n-1] 
-				mass[i]->posX2 = mass[i]->posX;				// x[n-2] = x[n-1]
-				mass[i]->posX = max(min(X_new,Xmax),Xmin);		// x[n-1] = x[n]	
-				mass[i]->speedX = mass[i]->posX - mass[i]->posX2;	// vx[n] = x[n] - x[n-1]
+			if ((*mi)->mobile == 1)  		{
+				X_new = (*mi)->forceX * (*mi)->invM + 2*(*mi)->posX - (*mi)->posX2; // x[n] =Fx[n]/M+2x[n]-x[n-1] 
+				(*mi)->posX2 = (*mi)->posX;				// x[n-2] = x[n-1]
+				(*mi)->posX = max(min(X_new,Xmax),Xmin);		// x[n-1] = x[n]	
+				(*mi)->speedX = (*mi)->posX - (*mi)->posX2;	// vx[n] = x[n] - x[n-1]
 				}
 
-		for (i=0; i<nb_mass; i++)	{
+		for (i=0, mi=mass; i<nb_mass; mi++, i++)	{
 		// clear forces
-			mass[i]->out_forceX = mass[i]->forceX;
-			mass[i]->forceX = 0;						// Fx[n] = 0
+			(*mi)->out_forceX = (*mi)->forceX;
+			(*mi)->forceX = 0;						// Fx[n] = 0
 		}
 	}
 
@@ -213,43 +212,54 @@ protected:
 
 	void m_forceX(int argc,t_atom *argv) 
 	{
-	// add a force to mass(es) named Id
+	// add a force to mass(es) named Id or No
 		t_int i;
-		const t_symbol *sym = GetSymbol(argv[0]);
+		const t_symbol *sym = GetASymbol(argv[0]);
+		t_mass **mi;
 
 		if (argc != 2)
 			error("forceX : Idmass value");
 
-		for (i=0; i<nb_mass;i++)
-		{
-			if (sym == mass[i]->Id)
-				mass[i]->forceX += GetFloat(argv[1]);
-		}
+		if (sym ==0)	
+			for (i=0, mi=mass; i<nb_mass; mi++, i++)
+			{
+				if (GetInt(argv[0]) == (*mi)->nbr)	{
+					(*mi)->forceX = GetFloat(argv[1]);
+					break;
+				}
+			}
+		else
+			for (i=0, mi=mass; i<nb_mass; mi++, i++)
+			{
+				if (sym == (*mi)->Id)
+					(*mi)->forceX = GetFloat(argv[1]);
+			}
 	}
 
 	void m_posX(int argc,t_atom *argv) 
 	{
-	// displace mass(es) named Id to a certain position
+	// displace mass(es) named Id or No to a certain position
 		t_int i;
 		const t_symbol *sym = GetASymbol(argv[0]);
+		t_mass **mi;
 
 		if (argc != 2)
 			error("posX : Id/Nomass value");
 
 		if (GetFloat(argv[1]) < Xmax && GetFloat(argv[1]) > Xmin)
 			if (sym ==0)	
-				for (i=0; i<nb_mass;i++)
+				for (i=0, mi=mass; i<nb_mass; mi++, i++)
 				{
-					if (GetInt(argv[0]) == mass[i]->nbr)	{
-						mass[i]->posX = GetFloat(argv[1]);
+					if (GetInt(argv[0]) == (*mi)->nbr)	{
+						(*mi)->posX = GetFloat(argv[1]);
 						break;
 					}
 				}
 			else
-				for (i=0; i<nb_mass;i++)
+				for (i=0, mi=mass; i<nb_mass; mi++, i++)
 				{
-					if (sym == mass[i]->Id)
-						mass[i]->posX = GetFloat(argv[1]);
+					if (sym == (*mi)->Id)
+						(*mi)->posX = GetFloat(argv[1]);
 				}
 	}
 
@@ -257,15 +267,16 @@ protected:
 	{
 	// set mass No to mobile
 		t_int i,aux;
+		t_mass **mi;
 	
 		if (argc != 1)
 			error("setMobile : Idmass");
 	
 		aux = GetInt(argv[0]);	
-		for (i=0; i<nb_mass;i++)
+		for (i=0, mi=mass; i<nb_mass; mi++, i++)
 			{
-				if (mass[i]->nbr == aux)
-					mass[i]->mobile = 1;
+				if ((*mi)->nbr == aux)
+					(*mi)->mobile = 1;
 			}
 	
 	}
@@ -274,15 +285,16 @@ protected:
 	{
 	// set mass No to fixed
 		t_int i,aux;
+		t_mass **mi;
 		
 		if (argc != 1)
 			error("setFixed : Idmass");
 
 		aux = GetInt(argv[0]);	
-		for (i=0; i<nb_mass;i++)
+		for (i=0, mi=mass; i<nb_mass; mi++, i++)
 			{
-				if (mass[i]->nbr == aux)
-					mass[i]->mobile = 0;
+				if ((*mi)->nbr == aux)
+					(*mi)->mobile = 0;
 			}
 	
 	}
@@ -293,14 +305,16 @@ protected:
 		t_int i,nb_link_delete=0;
 		t_atom sortie[5];
 		NEWARR(t_atom,aux,nb_link);
-	
+		t_mass **mi;
+		t_link **li;
+
 		if (argc != 1)
 			error("deleteMass : Nomass");
 
 		// Delete all associated links 
-		for (i=0; i<nb_link;i++)	{
-			if (link[i]->mass1->nbr == GetAInt(argv[0]) || link[i]->mass2->nbr == GetAInt(argv[0]))	{
-				SetFloat((aux[nb_link_delete]),link[i]->nbr);
+		for (i=0, li=link; i<nb_link; li++,i++)	{
+			if ((*li)->mass1->nbr == GetAInt(argv[0]) || (*li)->mass2->nbr == GetAInt(argv[0]))	{
+				SetFloat((aux[nb_link_delete]),(*li)->nbr);
 				nb_link_delete++;
 			}
 		}
@@ -309,15 +323,15 @@ protected:
 			m_delete_link(1,&aux[i]);
 	
 		// Delete mass
-		for (i=0; i<nb_mass;i++)
-			if (mass[i]->nbr == GetAInt(argv[0]))	{
-				SetFloat((sortie[0]),mass[i]->nbr);
-				SetSymbol((sortie[1]),mass[i]->Id);
-				SetFloat((sortie[2]),mass[i]->mobile);
-				SetFloat((sortie[3]),1/mass[i]->invM);
-				SetFloat((sortie[4]),mass[i]->posX);
-				delete mass[i];
-				mass[i] = mass[nb_mass-1]; 	// copy last mass instead 
+		for (i=0, mi=mass; i<nb_mass; mi++, i++)
+			if ((*mi)->nbr == GetAInt(argv[0]))	{
+				SetFloat((sortie[0]),(*mi)->nbr);
+				SetSymbol((sortie[1]),(*mi)->Id);
+				SetFloat((sortie[2]),(*mi)->mobile);
+				SetFloat((sortie[3]),1/(*mi)->invM);
+				SetFloat((sortie[4]),(*mi)->posX);
+				delete (*mi);
+				(*mi) = mass[nb_mass-1]; 	// copy last mass instead 
 				nb_mass--;
 				ToOutAnything(1,S_Mass_deleted,5,sortie);
 				break;
@@ -354,18 +368,20 @@ protected:
 		t_int i;
         	t_mass *mass1 = NULL;
         	t_mass *mass2 = NULL;
-        	
+ 		t_mass **mi;
+ 
+      	
         	if (argc < 6 || argc > 8)
         	    error("link : Id Nomass1 Nomass2 K D1 D2 (Lmin Lmax)");
 			
         	// check for existence of link masses:
-        	for (i=0; i<nb_mass;i++)
-				if (mass[i]->nbr==GetInt(argv[1]))	// pointer to mass1
+        	for (i=0, mi=mass; i<nb_mass; mi++, i++)
+				if ((*mi)->nbr==GetInt(argv[1]))	// pointer to mass1
 					// we found mass1
-        	        mass1 = mass[i];
-				else if (mass[i]->nbr==GetInt(argv[2]))	// pointer to mass2
+        	        		mass1 = (*mi);
+				else if ((*mi)->nbr==GetInt(argv[2]))	// pointer to mass2
 					// ... and mass2
-        	        mass2 = mass[i];
+        	        		mass2 = (*mi);
 
         	if (mass1 and mass2)
         	{
@@ -422,6 +438,7 @@ protected:
 		NEWARR(t_int,imass1,nb_mass);
 		NEWARR(t_int,imass2,nb_mass);
 		t_symbol *Id1, *Id2;
+		t_mass **mi;
 
 		if (argc < 6 || argc > 8)
 			error("ilink : Id Idmass1 Idmass2 K D1 D2 (Lmin Lmax)");
@@ -430,12 +447,12 @@ protected:
 		Id2 = GetSymbol(argv[2]);
 		ToOutAnything(1,S_iLink,0,aux);
 
-		for (i=0;i<nb_mass;i++)	{
-			if (Id1 == mass[i]->Id)	{
+		for (i=0, mi=mass; i<nb_mass; mi++, i++)	{
+			if (Id1 == (*mi)->Id)	{
 				imass1[nbmass1]=i;
 				nbmass1++;
 			}
-			if (Id2 == mass[i]->Id)	{
+			if (Id2 == (*mi)->Id)	{
 				imass2[nbmass2]=i;
 				nbmass2++;
 			}
@@ -471,14 +488,15 @@ protected:
 	// set rigidity of link(s) named Id
 		t_int i;
 		const t_symbol *sym = GetSymbol(argv[0]);
+		t_link **li;
 
 		if (argc != 2)
 			error("setK : IdLink Value");
 
-		for (i=0; i<nb_link;i++)
+		for (i=0, li=link; i<nb_link; li++,i++)
 		{
-			if (sym == link[i]->Id)
-				link[i]->K1 = GetFloat(argv[1]);
+			if (sym == (*li)->Id)
+				(*li)->K1 = GetFloat(argv[1]);
 		}
 	}
 
@@ -487,14 +505,15 @@ protected:
 	// set damping of link(s) named Id
 		t_int i;
 		const t_symbol *sym = GetSymbol(argv[0]);
+		t_link **li;
 
 		if (argc != 2)
 			error("setD : IdLink Value");
 
-		for (i=0; i<nb_link;i++)
+		for (i=0, li=link; i<nb_link; li++,i++)
 		{
-			if (sym == link[i]->Id)
-				link[i]->D1 = GetFloat(argv[1]);
+			if (sym == (*li)->Id)
+				(*li)->D1 = GetFloat(argv[1]);
 		}
 	}
 
@@ -503,14 +522,15 @@ protected:
 	// set damping of link(s) named Id
 		t_int i;
 		const t_symbol *sym = GetSymbol(argv[0]);
+		t_link **li;
 
 		if (argc != 2)
 			error("setD2 : IdLink Value");
 
-		for (i=0; i<nb_link;i++)
+		for (i=0, li=link; i<nb_link; li++,i++)
 		{
-			if (sym == link[i]->Id)
-				link[i]->D2 = GetFloat(argv[1]);
+			if (sym == (*li)->Id)
+				(*li)->D2 = GetFloat(argv[1]);
 		}
 	}
 
@@ -519,21 +539,22 @@ protected:
 	// Delete link
 		t_int i;
 		t_atom sortie[7];
+		t_link **li;
 
 		if (argc != 1)
 			error("deleteLink : NoLink");
 
-		for (i=0; i<nb_link;i++)
-			if (link[i]->nbr == GetInt(argv[0]))	{
-				SetFloat((sortie[0]),link[i]->nbr);
-				SetSymbol((sortie[1]),link[i]->Id);
-				SetFloat((sortie[2]),link[i]->mass1->nbr);
-				SetFloat((sortie[3]),link[i]->mass2->nbr);
-				SetFloat((sortie[4]),link[i]->K1);
-				SetFloat((sortie[5]),link[i]->D1);
-				SetFloat((sortie[6]),link[i]->D2);
-				delete link[i];
-				link[i]=link[nb_link-1];	// copy last link instead
+		for (i=0, li=link; i<nb_link; li++,i++)
+			if ((*li)->nbr == GetInt(argv[0]))	{
+				SetFloat((sortie[0]),(*li)->nbr);
+				SetSymbol((sortie[1]),(*li)->Id);
+				SetFloat((sortie[2]),(*li)->mass1->nbr);
+				SetFloat((sortie[3]),(*li)->mass2->nbr);
+				SetFloat((sortie[4]),(*li)->K1);
+				SetFloat((sortie[5]),(*li)->D1);
+				SetFloat((sortie[6]),(*li)->D2);
+				delete (*li);
+				(*li)=link[nb_link-1];	// copy last link instead
 				nb_link--;
 				ToOutAnything(1,S_Link_deleted,7,sortie);
 				break;
@@ -550,37 +571,40 @@ protected:
 		t_int i,j;
 		t_symbol *auxarg,*auxarg2, *auxtype;
 		t_atom sortie[3];
+		t_mass **mi;
+		t_link **li;
+
 		auxtype = GetSymbol(argv[0]);
 		auxarg = GetASymbol(argv[1]);			//auxarg : & symbol, 0 else
 		if (argc == 1)
 		{
 			if (auxtype == S_massesPos)		// get all masses positions
-				for (i=0; i<nb_mass; i++)
+				for (i=0, mi=mass; i<nb_mass; mi++, i++)
 				{	
-					SetFloat(sortie[0],mass[i]->nbr);	
-					SetFloat(sortie[1],mass[i]->posX);
+					SetFloat(sortie[0],(*mi)->nbr);	
+					SetFloat(sortie[1],(*mi)->posX);
 					ToOutAnything(0,S_massesPos,2,sortie);
 				}
 			else if (auxtype == S_massesForces)	// get all masses forces
-				for (i=0; i<nb_mass; i++)
+				for (i=0, mi=mass; i<nb_mass; mi++, i++)
 				{
-					SetFloat(sortie[0],mass[i]->nbr);
-					SetFloat(sortie[1],mass[i]->out_forceX);
+					SetFloat(sortie[0],(*mi)->nbr);
+					SetFloat(sortie[1],(*mi)->out_forceX);
 					ToOutAnything(0,S_massesForces,2,sortie);
 				}
 			else if (auxtype == S_linksPos)		// get all links positions
-				for (i=0; i<nb_link; i++)
+				for (i=0, li=link; i<nb_link; li++,i++)
 				{
-					SetFloat(sortie[0],link[i]->nbr);
-					SetFloat(sortie[1],link[i]->mass1->posX);
-					SetFloat(sortie[2],link[i]->mass2->posX);
+					SetFloat(sortie[0],(*li)->nbr);
+					SetFloat(sortie[1],(*li)->mass1->posX);
+					SetFloat(sortie[2],(*li)->mass2->posX);
 					ToOutAnything(0,S_linksPos,3,sortie);
 				}
 			else 					// get all masses speeds
-				for (i=0; i<nb_mass; i++)
+				for (i=0, mi=mass; i<nb_mass; mi++, i++)
 				{
-					SetFloat(sortie[0],mass[i]->nbr);
-					SetFloat(sortie[1],mass[i]->speedX);
+					SetFloat(sortie[0],(*mi)->nbr);
+					SetFloat(sortie[1],(*mi)->speedX);
 					ToOutAnything(0,S_massesSpeeds,2,sortie);
 				}
 		}
@@ -589,11 +613,11 @@ protected:
 			if (auxarg == 0) // No
 			{
 				for (j = 1; j<argc; j++)
-					for (i=0;i<nb_mass;i++)
-						if (mass[i]->nbr==GetInt(argv[j]))
+					for (i=0, mi=mass; i<nb_mass; mi++, i++)
+						if ((*mi)->nbr==GetInt(argv[j]))
 						{
-							SetFloat(sortie[0],mass[i]->nbr);
-							SetFloat(sortie[1],mass[i]->posX);
+							SetFloat(sortie[0],(*mi)->nbr);
+							SetFloat(sortie[1],(*mi)->posX);
 							ToOutAnything(0,S_massesPosNo,2,sortie);
 						}
 			}
@@ -602,12 +626,12 @@ protected:
 				for (j = 1; j<argc; j++)
 				{
 					auxarg2 = GetSymbol(argv[j]);
-					for (i=0;i<nb_mass;i++)	
+					for (i=0, mi=mass; i<nb_mass; mi++, i++)	
 					{
-						if (auxarg2==mass[i]->Id)
+						if (auxarg2==(*mi)->Id)
 						{
-							SetSymbol(sortie[0],mass[i]->Id);
-							SetFloat(sortie[1],mass[i]->posX);
+							SetSymbol(sortie[0],(*mi)->Id);
+							SetFloat(sortie[1],(*mi)->posX);
 							ToOutAnything(0,S_massesPosId,2,sortie);
 						}
 					}
@@ -619,11 +643,11 @@ protected:
 			if (auxarg == 0) // No
 			{
 				for (j = 1; j<argc; j++)
-					for (i=0;i<nb_mass;i++)
-						if (mass[i]->nbr==GetInt(argv[j]))
+					for (i=0, mi=mass; i<nb_mass; mi++, i++)
+						if ((*mi)->nbr==GetInt(argv[j]))
 						{
-							SetFloat(sortie[0],mass[i]->nbr);
-							SetFloat(sortie[1],mass[i]->out_forceX);
+							SetFloat(sortie[0],(*mi)->nbr);
+							SetFloat(sortie[1],(*mi)->out_forceX);
 							ToOutAnything(0,S_massesForcesNo,2,sortie);
 						}
 			}
@@ -632,12 +656,12 @@ protected:
 				for (j = 1; j<argc; j++)
 				{
 					auxarg2 = GetSymbol(argv[j]);
-					for (i=0;i<nb_mass;i++)	
+					for (i=0, mi=mass; i<nb_mass; mi++, i++)	
 					{
-						if (auxarg2==mass[i]->Id)
+						if (auxarg2==(*mi)->Id)
 						{
-							SetSymbol(sortie[0],mass[i]->Id);
-							SetFloat(sortie[1],mass[i]->out_forceX);
+							SetSymbol(sortie[0],(*mi)->Id);
+							SetFloat(sortie[1],(*mi)->out_forceX);
 							ToOutAnything(0,S_massesForcesId,2,sortie);
 						}	
 					}
@@ -649,12 +673,12 @@ protected:
 			if (auxarg == 0) // No
 			{
 				for (j = 1; j<argc; j++)
-					for (i=0;i<nb_link;i++)
-						if (link[i]->nbr==GetInt(argv[j]))
+					for (i=0, li=link; i<nb_link; li++,i++)
+						if ((*li)->nbr==GetInt(argv[j]))
 						{
-							SetFloat(sortie[0],link[i]->nbr);
-							SetFloat(sortie[1],link[i]->mass1->posX);
-							SetFloat(sortie[2],link[i]->mass2->posX);
+							SetFloat(sortie[0],(*li)->nbr);
+							SetFloat(sortie[1],(*li)->mass1->posX);
+							SetFloat(sortie[2],(*li)->mass2->posX);
 							ToOutAnything(0,S_linksPosNo,3,sortie);
 						}
 			}
@@ -663,13 +687,13 @@ protected:
 				for (j = 1; j<argc; j++)
 				{
 					auxarg2 = GetSymbol(argv[j]);
-					for (i=0;i<nb_link;i++)	
+					for (i=0, li=link; i<nb_link; li++,i++)	
 					{
-						if (auxarg2==link[i]->Id)
+						if (auxarg2==(*li)->Id)
 						{
-							SetSymbol(sortie[0],link[i]->Id);
-							SetFloat(sortie[1],link[i]->mass1->posX);
-							SetFloat(sortie[2],link[i]->mass2->posX);
+							SetSymbol(sortie[0],(*li)->Id);
+							SetFloat(sortie[1],(*li)->mass1->posX);
+							SetFloat(sortie[2],(*li)->mass2->posX);
 							ToOutAnything(0,S_linksPosId,3,sortie);
 						}
 					}
@@ -681,11 +705,11 @@ protected:
 			if (auxarg == 0) // No
 			{
 				for (j = 1; j<argc; j++)
-					for (i=0;i<nb_mass;i++)
-						if (mass[i]->nbr==GetInt(argv[j]))
+					for (i=0, mi=mass; i<nb_mass; mi++, i++)
+						if ((*mi)->nbr==GetInt(argv[j]))
 						{
-							SetFloat(sortie[0],mass[i]->nbr);
-							SetFloat(sortie[1],mass[i]->speedX);
+							SetFloat(sortie[0],(*mi)->nbr);
+							SetFloat(sortie[1],(*mi)->speedX);
 							ToOutAnything(0,S_massesSpeedsNo,2,sortie);
 						}
 			}
@@ -694,12 +718,12 @@ protected:
 				for (j = 1; j<argc; j++)
 				{
 					auxarg2 = GetSymbol(argv[j]);
-					for (i=0;i<nb_mass;i++)	
+					for (i=0, mi=mass; i<nb_mass; mi++, i++)	
 					{
-						if (auxarg2==mass[i]->Id)
+						if (auxarg2==(*mi)->Id)
 						{
-							SetSymbol(sortie[0],mass[i]->Id);
-							SetFloat(sortie[1],mass[i]->speedX);
+							SetSymbol(sortie[0],(*mi)->Id);
+							SetFloat(sortie[1],(*mi)->speedX);
 							ToOutAnything(0,S_massesSpeedsId,2,sortie);
 						}
 					}
@@ -715,9 +739,10 @@ protected:
 	{	
 		NEWARR(t_atom,sortie,nb_mass);
 		t_int i;
+		t_mass **mi;
 	
-		for (i=0; i<nb_mass; i++)	{
-			SetFloat((sortie[i]),mass[i]->posX);
+		for (i=0, mi=mass; i<nb_mass; mi++, i++)	{
+			SetFloat((sortie[i]),(*mi)->posX);
 		}
 		ToOutAnything(0, S_massesPosL, nb_mass, sortie);
 		DELARR(sortie);
@@ -728,9 +753,10 @@ protected:
 	{	
 		NEWARR(t_atom,sortie,nb_mass);
 		t_int i;
+		t_mass **mi;
 	
-		for (i=0; i<nb_mass; i++)	{
-			SetFloat((sortie[i]),mass[i]->out_forceX);
+		for (i=0, mi=mass; i<nb_mass; mi++, i++)	{
+			SetFloat((sortie[i]),(*mi)->out_forceX);
 		}
 		ToOutAnything(0, S_massesForcesL, nb_mass, sortie);
 		DELARR(sortie);
@@ -741,24 +767,26 @@ protected:
 	{	
 		t_atom sortie[7];
 		t_int i;
+		t_mass **mi;
+		t_link **li;
 	
-		for (i=0; i<nb_mass; i++)	{
-			SetFloat((sortie[0]),mass[i]->nbr);
-			SetSymbol((sortie[1]),mass[i]->Id);
-			SetFloat((sortie[2]),mass[i]->mobile);
-			SetFloat((sortie[3]),1/mass[i]->invM);
-			SetFloat((sortie[4]),mass[i]->posX);
+		for (i=0, mi=mass; i<nb_mass; mi++, i++)	{
+			SetFloat((sortie[0]),(*mi)->nbr);
+			SetSymbol((sortie[1]),(*mi)->Id);
+			SetFloat((sortie[2]),(*mi)->mobile);
+			SetFloat((sortie[3]),1/(*mi)->invM);
+			SetFloat((sortie[4]),(*mi)->posX);
 		ToOutAnything(1, S_Mass, 5, sortie);
 		}
 
-		for (i=0; i<nb_link; i++)	{
-			SetFloat((sortie[0]),link[i]->nbr);
-			SetSymbol((sortie[1]),link[i]->Id);
-			SetFloat((sortie[2]),link[i]->mass1->nbr);
-			SetFloat((sortie[3]),link[i]->mass2->nbr);
-			SetFloat((sortie[4]),link[i]->K1);
-			SetFloat((sortie[5]),link[i]->D1);
-			SetFloat((sortie[6]),link[i]->D2);
+		for (i=0, li=link; i<nb_link; li++,i++)	{
+			SetFloat((sortie[0]),(*li)->nbr);
+			SetSymbol((sortie[1]),(*li)->Id);
+			SetFloat((sortie[2]),(*li)->mass1->nbr);
+			SetFloat((sortie[3]),(*li)->mass2->nbr);
+			SetFloat((sortie[4]),(*li)->K1);
+			SetFloat((sortie[5]),(*li)->D1);
+			SetFloat((sortie[6]),(*li)->D2);
 		ToOutAnything(1, S_Link, 7, sortie);
 		}