X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=packages%2Fstd%2Fsrc%2FbbstdMathOperationVector.cxx;h=cbd934fd015f4d523779927973fd25aa5b2eaa46;hb=2dd2633fa3c6c6861a6ce62f1055d867bed534de;hp=454311f671378d95f6f922255e529284c05fba10;hpb=433d792763e9cebb963243fbd49fff719f69ed4a;p=bbtk.git

diff --git a/packages/std/src/bbstdMathOperationVector.cxx b/packages/std/src/bbstdMathOperationVector.cxx
index 454311f..cbd934f 100644
--- a/packages/std/src/bbstdMathOperationVector.cxx
+++ b/packages/std/src/bbstdMathOperationVector.cxx
@@ -116,8 +116,8 @@ void MathOperationVector::Process()
 	std::vector<double> *v8 = &_v8;
 	std::vector<double> *v9 = &_v9;
 
-	double minTmp;		
-	double maxTmp;		
+	double minTmp;
+	double maxTmp;
 
  	 if (firsttime==true)
 	 {
@@ -415,7 +415,104 @@ void MathOperationVector::Process()
 			resultVec.push_back(   (int)bbGetInputIn0()[i] % (int)bbGetInputIn1()[i]   );
 		} // for i
 		bbSetOutputOut( resultVec );
-	} // Type 18
+	} // Type 19
+
+    if (bbGetInputType()==20)
+	{
+		for (i=0;i<sizeVec;i++)
+		{
+			if (bbGetInputIn0()[i] < bbGetInputIn1()[i])
+			{
+				resultVec.push_back( 1 );
+			} else {
+				resultVec.push_back( 0 );
+			}
+		} // for i
+		bbSetOutputOut( resultVec );
+	} // Type 20
+
+    if (bbGetInputType()==21)
+	{
+		for (i=0;i<sizeVec;i++)
+		{
+			if (bbGetInputIn0()[i] > bbGetInputIn1()[i])
+			{
+				resultVec.push_back( 1 );
+			} else {
+				resultVec.push_back( 0 );
+			}
+		} // for i
+		bbSetOutputOut( resultVec );
+	} // Type 21
+
+
+    if (bbGetInputType()==22) 
+	{
+		double resultX=0;
+		double resultY=0;
+		double resultZ=0;
+		double resultMassTotal=0;
+		for (i=0;i<sizeVec;i++)
+		{
+			resultX 		= resultX + g(v0,i,0)*g(v3,i,1);
+			resultY 		= resultY + g(v1,i,0)*g(v3,i,1);
+			resultZ 		= resultZ + g(v2,i,0)*g(v3,i,1);
+			resultMassTotal = resultMassTotal + g(v3,i,1);
+		} // for i
+		if (resultMassTotal!=0) 
+		{
+			resultVec.push_back( resultX / resultMassTotal );
+			resultVec.push_back( resultY / resultMassTotal );
+			resultVec.push_back( resultZ / resultMassTotal );
+		} // if resultMassTotal
+		bbSetOutputOut( resultVec );
+	} // if Type 22
+
+
+    if (bbGetInputType()==23)
+	{
+		for (i=0;i<sizeVec;i++)
+		{
+			resultVec.push_back(  round(  bbGetInputIn0()[i] )  );
+		} // for i
+		bbSetOutputOut( resultVec );
+	} // Type 23
+
+    if (bbGetInputType()==24)
+	{
+		for (i=0;i<sizeVec;i++)
+		{
+			resultVec.push_back(  rint(  bbGetInputIn0()[i] )  );
+		} // for i
+		bbSetOutputOut( resultVec );
+	} // Type 24
+
+    if (bbGetInputType()==25)
+	{
+		for (i=0;i<sizeVec;i++)
+		{
+			resultVec.push_back(  floor(  bbGetInputIn0()[i] )  );
+		} // for i
+		bbSetOutputOut( resultVec );
+	} // Type 25
+
+    if (bbGetInputType()==26)
+	{
+		for (i=0;i<sizeVec;i++)
+		{
+			resultVec.push_back(  ceil(  bbGetInputIn0()[i] )  );
+		} // for i
+		bbSetOutputOut( resultVec );
+	} // Type 26
+
+    if (bbGetInputType()==27)
+	{
+		for (i=0;i<sizeVec;i++)
+		{
+			resultVec.push_back(  trunc(  bbGetInputIn0()[i] )  );
+		} // for i
+		bbSetOutputOut( resultVec );
+	} // Type 27
 
 }