updates to the stim::vec class

David Mayerich
1 parent 2dec3dbb
Showing 2 changed files with 9 additions and 13 deletions Show diff stats
stim/math/vector.h
stim/visualization/obj.h
@@ -69,8 +69,9 @@ struct vec : public std::vector&lt;T&gt;
 	//copy constructor
 	vec( const vec<T>& other){
 		unsigned int N = other.size();
-		for(unsigned int i=0; i<N; i++)
-			push_back(other[i]);
+		resize(N);							//resize the current vector to match the copy
+		for(unsigned int i=0; i<N; i++)		//copy each element
+			at(i) = other[i];
 	}
 	//I'm not sure what these were doing here.
@@ -7,6 +7,7 @@
 #include <stdlib.h>
 #include <stim/parser/parser.h>
 #include <stim/math/vector.h>
+#include <algorithm>
 namespace stim{
@@ -572,8 +573,6 @@ public:
 		std::vector< stim::vec<T> > v;
 		v.resize(vi.size());							//pre-allocate an array of vertices
-		std::cout<<"stim::obj::getV: "<<v.size()<<std::endl;
-
 		for(unsigned i = 0; i < vi.size(); i++)
 			v[i] = V[vi[i] - 1];
@@ -587,8 +586,6 @@ public:
 		std::vector< stim::vec<T> > vt;
 		vt.resize(vti.size());							//pre-allocate an array of vertices
-		std::cout<<"stim::obj::getV: "<<vt.size()<<std::endl;
-
 		for(unsigned i = 0; i < vti.size(); i++)
 			vt[i] = VT[vti[i] - 1];
@@ -602,8 +599,6 @@ public:
 		std::vector< stim::vec<T> > vn;
 		vn.resize(vni.size());							//pre-allocate an array of vertices
-		std::cout<<"stim::obj::getV: "<<vn.size()<<std::endl;
-
 		for(unsigned i = 0; i < vni.size(); i++)
 			vn[i] = VN[vni[i] - 1];
@@ -794,14 +789,14 @@ public:
 	}
 	/// Returns a list of points corresponding to the vertices of a line
-	void getLine(unsigned l, std::vector< stim::vec<T> > v){
+	void getLine(unsigned l, std::vector< stim::vec<T> >& v){
 		std::vector<unsigned> vi;			//create a vector to store indices to vertices
 		getLinei(l, vi);					//get the indices for the line vertices
 		v = getV(vi);						//get the vertices corresponding to the indices
 	}
-	void getLine(unsigned l, std::vector< stim::vec<T> > v, std::vector< stim::vec<T> > vt){
+	void getLine(unsigned l, std::vector< stim::vec<T> >& v, std::vector< stim::vec<T> >& vt){
 		std::vector<unsigned> vi, vti;
 		getLinei(l, vi, vti);					//get the indices for the line vertices
@@ -809,9 +804,9 @@ public:
 		vt = getVT(vti);
 	}
-	void getLine(unsigned l, std::vector< stim::vec<T> > v, 
-							 std::vector< stim::vec<T> > vt, 
-							 std::vector< stim::vec<T> > vn){
+	void getLine(unsigned l, std::vector< stim::vec<T> >& v,
+							 std::vector< stim::vec<T> >& vt,
+							 std::vector< stim::vec<T> >& vn){
 		std::vector<unsigned> vi, vti, vni;
 		getLinei(l, vi, vti, vni);					//get the indices for the line vertices