minor changes for NetMets

David Mayerich
1 parent aabe886c
Showing 2 changed files with 10 additions and 9 deletions Show diff stats
stim/biomodels/network.h
stim/math/vector.h
@@ -125,7 +125,9 @@ public:
 		return V.size();
 	}
-	std::vector<vertex> operator*(T s){
+	//scale the network by some constant value
+	//	I don't think these work??????
+	/*std::vector<vertex> operator*(T s){
 		for (unsigned i=0; i< vertices; i ++ ){
 			V[i] = V[i] * s;
 		}
@@ -139,10 +141,9 @@ public:
 			}
 		}
 		return V;
-	}
+	}*/
 	// Returns an average of branching index in the network
-
 	double BranchingIndex(){
 		double B=0;
 		for(unsigned v=0; v < V.size(); v ++){
@@ -154,7 +155,6 @@ public:
 	}
 	// Returns number of branch points in thenetwork
-
 	unsigned int BranchP(){
 		unsigned int B=0;
 		unsigned int c;
@@ -168,7 +168,6 @@ public:
 	}
 	// Returns number of end points (tips) in thenetwork
-
 	unsigned int EndP(){
 		unsigned int B=0;
 		unsigned int c;
@@ -202,7 +201,7 @@ public:
 	//	return s;
 	//}
-
+	//Calculate Metrics---------------------------------------------------
 	// Returns an average of fiber/edge lengths in the network
 	double Lengths(){
 		stim::vec<T> L;
@@ -270,8 +269,10 @@ public:
 	double avg = sumFractDim / E.size();
 	return avg;
 	}
-	stim::cylinder<T> get_cylinder(unsigned f){
-		return E[f];									//return the specified edge (casting it to a fiber)
+
+	//returns a cylinder represented a given fiber (based on edge index)
+	stim::cylinder<T> get_cylinder(unsigned e){
+		return E[e];									//return the specified edge (casting it to a fiber)
 	}
 	//load a network from an OBJ file
@@ -338,7 +338,7 @@ struct vec : public std::vector&lt;T&gt;
 	/// Cast to a vec3
 	operator stim::vec3<T>(){
 		stim::vec3<T> r;
-		size_t N = min(size(), (size_t)3);
+		size_t N = std::min(size(), (size_t)3);
 		for(size_t i = 0; i < N; i++)
 			r[i] = at(i);
 		return r;