diff --git a/stim/biomodels/flow.h b/stim/biomodels/flow.h index 8f080fd..2b6cd4a 100644 --- a/stim/biomodels/flow.h +++ b/stim/biomodels/flow.h @@ -18,9 +18,9 @@ public: void copyToArray(int *src, int *dest, float *radii, float *len); int getDangleNodes(int datarow, int numNodes, int *row, int *column, int *dangleNodes); void inversion(float **a, int n, float **b); - float determinant(float **a, int n); protected: + float determinant(float **a, int n); int minor(float **src, float **dest, int row, int col, int order); }; @@ -39,7 +39,7 @@ int flow::getDangleNodes(int datarow, int numNodes, int *column1, int *column2, if( column2[i] == column2[y] ) // Is there a match? { st = column2[i]; // Save the matching node - cout << endl << column2[i] << " = " << column2[y] << endl; // Display the matching nodes +// cout << endl << column2[i] << " = " << column2[y] << endl; // Display the matching nodes memmove(column2+i, column2+i+1, (datarow-(i+1)) * sizeof(column2[0])); // Move up the rows // taking the places of the rows before them starting // with where the matching node is located @@ -49,10 +49,10 @@ int flow::getDangleNodes(int datarow, int numNodes, int *column1, int *column2, diff1++; // Count the matching node // Display the updated array (with the matching node moved to the bottommost row) - cout << "Updated array:" << endl; +/* cout << "Updated array:" << endl; for( int k = 0; k < datarow; k++ ) cout << column2[k] << endl; - +*/ // Decrement the counters // NOTE: The counters need to be decremented because the rows had been moved up, so the same // locations need to be read again because they contain different values now after the move. @@ -71,11 +71,11 @@ int flow::getDangleNodes(int datarow, int numNodes, int *column1, int *column2, // Store the nodes that have no duplicates // NOTE: This will only save the nodes that have not been moved to the bottom. - cout << "\ndangleNodes array:" << endl; +// cout << "\ndangleNodes array:" << endl; for( int j = 0; j < datarow-diff1; j++ ) { dangleNodes[numPress] = column2[j]; - cout << dangleNodes[j] << endl; // DELETE!!! +// cout << dangleNodes[j] << endl; // DELETE!!! numPress++; // Count the non-duplicated node } @@ -89,18 +89,18 @@ int flow::getDangleNodes(int datarow, int numNodes, int *column1, int *column2, if( dangleNodes[i] == column1[j] ) // Is there a match? { st = column1[j]; // Save the matching node - cout << endl << dangleNodes[i] << " = " << column1[j] << endl; // Display the matching nodes +// cout << endl << dangleNodes[i] << " = " << column1[j] << endl; // Display the matching nodes memmove(dangleNodes+i, dangleNodes+i+1, (datarow-diff1-(i+1)) * sizeof(dangleNodes[0])); dangleNodes[count-1] = st; // Move the matching node to the bottom of the array diff2++; // Count the matching node // Display the updated array - cout << "Updated dangleNodes array:" << endl; +/* cout << "Updated dangleNodes array:" << endl; for( int k = 0; k < count-1; k++ ) { cout << dangleNodes[k] << endl; } - +*/ // Decrement the counters i--; j--; diff --git a/stim/visualization/obj.h b/stim/visualization/obj.h index d2591bc..b758fba 100644 --- a/stim/visualization/obj.h +++ b/stim/visualization/obj.h @@ -669,7 +669,7 @@ public: /// Returns the vertex indices for the specified line /// @param i is the index of the line - /*std::vector< unsigned int > getL_Vi(unsigned int i){ + std::vector< unsigned int > getL_Vi(unsigned int i){ unsigned int nP = L[i].size(); @@ -686,12 +686,12 @@ public: } return l; - }*/ + } /// Returns a vector containing the list of texture coordinates associated with each point of a line. /// @param i is the index of the desired line - /*std::vector< stim::vec > getL_VT(unsigned int i){ + std::vector< stim::vec > getL_VT(unsigned int i){ //get the number of points in the specified line unsigned int nP = L[i].size(); @@ -717,7 +717,7 @@ public: } return l; - }*/ + } /// Add an array of vertices to the vertex list unsigned int addV(std::vector< stim::vec > vertices){ -- libgit2 0.21.4