yade-dev team mailing list archive

Thread
Date

[Branch ~yade-pkg/yade/git-trunk] Rev 3821: Use tuple as a parameter for SplitPolyhedraDouble

To: Yade developers <yade-dev@xxxxxxxxxxxxxxxxxxx>
From: noreply@xxxxxxxxxxxxx
Date: Fri, 25 Mar 2016 08:04:25 -0000
Reply-to: noreply@xxxxxxxxxxxxx
Sender: bounces@xxxxxxxxxxxxx

------------------------------------------------------------
revno: 3821
committer: Anton Gladky <gladky.anton@xxxxxxxxx>
timestamp: Thu 2016-03-24 23:08:26 +0100
message:
  Use tuple as a parameter for SplitPolyhedraDouble
  
  Simplifies the code
modified:
  pkg/dem/Polyhedra_splitter.cpp


--
lp:yade
https://code.launchpad.net/~yade-pkg/yade/git-trunk

Your team Yade developers is subscribed to branch lp:yade.
To unsubscribe from this branch go to https://code.launchpad.net/~yade-pkg/yade/git-trunk/+edit-subscription

=== modified file 'pkg/dem/Polyhedra_splitter.cpp'
--- pkg/dem/Polyhedra_splitter.cpp	2016-03-24 22:08:26 +0000
+++ pkg/dem/Polyhedra_splitter.cpp	2016-03-24 22:08:26 +0000
@@ -8,6 +8,8 @@
 YADE_PLUGIN((PolyhedraSplitter));
 CREATE_LOGGER(PolyhedraSplitter);
 
+using PSplitT = std::tuple<const shared_ptr<Body>&, Vector3r, Vector3r>;
+
 //*********************************************************************************
 /* Evaluate tensorial stress estimation in polyhedras */
 
@@ -50,13 +52,16 @@
 
 //**********************************************************************************
 //split polyhedra
-void SplitPolyhedraDouble(const shared_ptr<Body>& body, Vector3r direction1, Vector3r direction2){
-	const Se3r& se3=body->state->se3; 
-	Vector3r point = se3.position;
+void SplitPolyhedraDouble(const PSplitT & split){
+	const auto & b =(get<0>(split));
+	const auto & d1=(get<1>(split));
+	const auto & d2=(get<2>(split));
+	const Se3r& se3=b->state->se3;
+	const Vector3r pnt = se3.position;
 
-	shared_ptr<Body> B2 = SplitPolyhedra(body, direction1, point);
-	shared_ptr<Body> B3 = SplitPolyhedra(B2, direction2, point);
-	shared_ptr<Body> B4 = SplitPolyhedra(body, direction2, point);
+	shared_ptr<Body> B2 = SplitPolyhedra(b, d1, pnt);
+	shared_ptr<Body> B3 = SplitPolyhedra(B2, d2, pnt);
+	shared_ptr<Body> B4 = SplitPolyhedra(b, d2, pnt);
 }
 
 //*********************************************************************************
@@ -67,10 +72,7 @@
 	const shared_ptr<Scene> _rb=shared_ptr<Scene>();
 	shared_ptr<Scene> rb=(_rb?_rb:Omega::instance().getScene());
 
-	vector<shared_ptr<Body> > bodies;
-	vector<Vector3r > directions1, directions2;
-	vector<Real > sigmas;
-
+	vector<PSplitT> splitsV;
 	vector<Matrix3r> bStresses (scene->bodies->size(), Matrix3r::Zero());
 	getStressForEachBody(bStresses);
 
@@ -100,14 +102,11 @@
 			//double sigma_t = -comp_stress/2.+ tens_stress;
 			const Real sigma_t = pow((pow(I_valu(0,0)-I_valu(1,1),2)+pow(I_valu(0,0)-I_valu(2,2),2)+pow(I_valu(1,1)-I_valu(2,2),2))/2.,0.5)/p->GetVolume();
 			if (sigma_t > getStrength(p->GetVolume(),m->GetStrength())) {
-				bodies.push_back(b);
-				directions1.push_back(dir1.normalized());
-				directions2.push_back(dir2.normalized());
-				sigmas.push_back(sigma_t);
+				splitsV.push_back(std::make_tuple(b, dir1.normalized(), dir2.normalized()));
 			}
 		}
 	}
-	for(unsigned int i=0; i<bodies.size(); i++) SplitPolyhedraDouble(bodies[i], directions1[i], directions2[i]);
+	std::for_each(splitsV.begin(), splitsV.end(), &SplitPolyhedraDouble);
 }
 
 #endif // YADE_CGAL