Merge pull request #248 from wanqing0421/multiRotatingAxis

PhasicFlow · web-flow · commit 1258cb190fcb · 2025-10-15T08:51:23.000+03:30
fix the bug about line initial
diff --git a/src/Interaction/sphereInteraction/sphereInteractionsLinearModels.cpp b/src/Interaction/sphereInteraction/sphereInteractionsLinearModels.cpp
@@ -58,6 +58,6 @@ createInteraction(pFlow::cfModels::limitedLinearNormalRolling, pFlow::conveyorBe
 createInteraction(pFlow::cfModels::nonLimitedLinearNormalRolling,pFlow::conveyorBeltMotionGeometry);
 
 // multiRotationAxisMotionGeometry
-//createInteraction(pFlow::cfModels::limitedLinearNormalRolling, pFlow::multiRotationAxisMotionGeometry);
-//createInteraction(pFlow::cfModels::nonLimitedLinearNormalRolling,pFlow::multiRotationAxisMotionGeometry);
+createInteraction(pFlow::cfModels::limitedLinearNormalRolling, pFlow::multiRotationAxisMotionGeometry);
+createInteraction(pFlow::cfModels::nonLimitedLinearNormalRolling,pFlow::multiRotationAxisMotionGeometry);
 
diff --git a/src/Interaction/sphereInteraction/sphereInteractionsNonLinearModels.cpp b/src/Interaction/sphereInteraction/sphereInteractionsNonLinearModels.cpp
@@ -58,5 +58,5 @@ createInteraction(pFlow::cfModels::limitedNonLinearNormalRolling, pFlow::conveyo
 createInteraction(pFlow::cfModels::nonLimitedNonLinearNormalRolling,pFlow::conveyorBeltMotionGeometry);
 
 // multiRotationAxisMotionGeometry
-//createInteraction(pFlow::cfModels::limitedNonLinearNormalRolling, pFlow::multiRotationAxisMotionGeometry);
-//createInteraction(pFlow::cfModels::nonLimitedNonLinearNormalRolling,pFlow::multiRotationAxisMotionGeometry);
+createInteraction(pFlow::cfModels::limitedNonLinearNormalRolling, pFlow::multiRotationAxisMotionGeometry);
+createInteraction(pFlow::cfModels::nonLimitedNonLinearNormalRolling,pFlow::multiRotationAxisMotionGeometry);
diff --git a/src/phasicFlow/structuredData/line/line.hpp b/src/phasicFlow/structuredData/line/line.hpp
@@ -50,6 +50,7 @@ class line
 	//// - Constructors 
 		FUNCTION_HD
 		line()
+		: v21_(1, 0, 0), p1_(0, 0, 0)
 		{}
 
 		FUNCTION_HD
@@ -86,6 +87,10 @@ class line
 		void set(const realx3 &lp1, const realx3 &lp2)
 		{
 			v21_ = lp2 - lp1;
+			if(v21_.length() < verySmallValue)
+			{
+				v21_ = realx3(1, 0, 0);
+			}
 			p1_ = lp1;
 		}
 
@@ -121,7 +126,7 @@ class line
 		real projectNormalizedLength(realx3 p) const 
 		{
 			realx3 w = p - p1_;
-			return dot(w,v21_) / dot(v21_,v21_);
+			return dot(w, v21_) / dot(v21_, v21_);
 		}
 
 	//// - IO operation 

Original file line number	Diff line number	Diff line change
`@@ -50,6 +50,7 @@ class line`
`50`	`50`	`//// - Constructors`
`51`	`51`	`FUNCTION_HD`
`52`	`52`	`line()`
	`53`	`+ : v21_(1, 0, 0), p1_(0, 0, 0)`
`53`	`54`	`{}`
`54`	`55`
`55`	`56`	`FUNCTION_HD`
`@@ -86,6 +87,10 @@ class line`
`86`	`87`	`void set(const realx3 &lp1, const realx3 &lp2)`
`87`	`88`	`{`
`88`	`89`	`v21_ = lp2 - lp1;`
	`90`	`+ if(v21_.length() < verySmallValue)`
	`91`	`+ {`
	`92`	`+ v21_ = realx3(1, 0, 0);`
	`93`	`+ }`
`89`	`94`	`p1_ = lp1;`
`90`	`95`	`}`
`91`	`96`
`@@ -121,7 +126,7 @@ class line`
`121`	`126`	`real projectNormalizedLength(realx3 p) const`
`122`	`127`	`{`
`123`	`128`	`realx3 w = p - p1_;`
`124`		`- return dot(w,v21_) / dot(v21_,v21_);`
	`129`	`+ return dot(w, v21_) / dot(v21_, v21_);`
`125`	`130`	`}`
`126`	`131`
`127`	`132`	`//// - IO operation`