return resampled edge as fiber

pranathivemuri
1 parent df480014
Showing 2 changed files with 12 additions and 38 deletions Show diff stats
stim/biomodels/fiber.h
stim/biomodels/network.h
@@ -168,33 +168,6 @@ public:
 		gen_kdtree();
 	}
-	///// This constructor takes a list of points and radii
-	//fiber(std::list< stim::vec< T > > pos, std::list< T > radii){
-
-	//	init(pos.size());								//initialize the array size
-
-	//	//create an iterator for each list
-	//	typename std::list< stim::vec< T > >::iterator pi = pos.begin();
-	//	typename std::list< T >::iterator ri = radii.begin();
-
-	//	//create a counter for indexing into the fiber array
-	//	unsigned int i = 0;
-
-	//	//for each point, set the position and radius
-	//	for(pi = pos.begin(), ri = radii.begin(); pi != pos.end(); pi++, ri++){
-
-	//		//set the centerline position
-	//		for(unsigned int d = 0; d < 3; d++)
-	//			c[i][d] = (double) (*pi)[d];			
-	//		
-	//		r[i] =  *ri;								//set the radius
-	//		i++;									//increment the array index
-	//	}
-
-	//	gen_kdtree();								//generate a kd tree
-
-	//}
-
 	/// constructor takes an array of points and radii
 	//		this function is used when the radii are represented as a stim::vec,
 	//		since this may be easier when importing OBJs
@@ -488,15 +461,16 @@ public:
 		return get_vec(N-1);
 	}
 		////resample a fiber in the network
-	std::vector<stim::vec<T> > Resample(std::vector< stim::vec<T> > fiberPositions, float spacing=25.0)
+	stim::fiber<T> Resample(T spacing=25.0)
 	{
+
 		std::vector<T> v(3);    //v-direction vector of the segment
 		stim::vec<T> p(3);      //- intermediate point to be added
 		std::vector<T> p1(3);   // p1 - starting point of an segment on the fiber, 
 		std::vector<T> p2(3);   // p2 - ending point, 
 		double sum=0;  //distance summation
-
+		std::vector<stim::vec<T> > fiberPositions = centerline();
 		std::vector<stim::vec<T> > newPointList; // initialize list of new resampled points on the fiber
 		// for each point on the centerline (skip if it is the last point on centerline)
 		unsigned int N = fiberPositions.size(); // number of points on the fiber
@@ -531,7 +505,8 @@ public:
 				newPointList.push_back(fiberPositions[f+1]);
 			}
 		newPointList.push_back(fiberPositions[N-1]);   //add the last point on the fiber to the new fiber list
-		return newPointList;
+		fiber newFiber(newPointList);
+		return newFiber;
 	}
 };
@@ -32,6 +32,8 @@ class network{
 	{
 		public:
 		unsigned v[2];		//unique id's designating the starting and ending
+		// default constructor
+		edge() : fiber<T>(){v[1] = -1; v[0] = -1;}
 		/// Constructor - creates an edge from a list of points by calling the stim::fiber constructor
@@ -154,14 +156,11 @@ class network{
 				V[it_idx].e[1].push_back(E.size());				//add the current edge as incoming
 				e.v[1] = it_idx;
 			}
-			/*lines to be added for resampling each fiber in the network class
-			//std::vector< stim::vec<T> > newFiberPos, fiberPos;
-			//fiberPos = e.centerline();
-			//newFiberPos = e.Resample(fiberPos);
-			//edge newEdge = newFiberPos;
-			//E.push_back(newEdge);	
-			*/
-			
+			stim::fiber<T> f = e.Resample(25.0);
+			std::cout<<"resampled fiber length"<<std::endl;
+			std::cout<<f.length()<<std::endl;
+			std::cout<<"resampled fiber--"<<std::endl;
+			std::cout<<f.str()<<std::endl;
 			E.push_back(e);										//push the edge to the list
 		}