Commit 296aa37dbf64edeae1cb484816fccdb755bb2c5d
1 parent
5038a7ca
fixed parsing errors
Showing
1 changed file
with
5 additions
and
5 deletions
Show diff stats
stim/biomodels/network.h
... | ... | @@ -79,7 +79,7 @@ class network{ |
79 | 79 | |
80 | 80 | } |
81 | 81 | */ |
82 | - edge(std::vector<stim::vec3<T> p, std::vector<T> s) | |
82 | + edge(std::vector<stim::vec3<T> > p, std::vector<T> s) | |
83 | 83 | : cylinder<T>(p,s) |
84 | 84 | { |
85 | 85 | } |
... | ... | @@ -599,7 +599,7 @@ public: |
599 | 599 | int dims[2]; ///number of vertex, number of edges |
600 | 600 | readHeader(filename, &dims[0]); //read header |
601 | 601 | std::ifstream file; |
602 | - file.open(filename, std::ios::in | std::ios::binary); ///skip header information. | |
602 | + file.open(filename.c_str(), std::ios::in | std::ios::binary); ///skip header information. | |
603 | 603 | file.seekg(14+58+4+4, file.beg); |
604 | 604 | vertex v; |
605 | 605 | for(int i = 0; i < dims[0]; i++) ///for every vertex, read vertex, add to network. |
... | ... | @@ -626,7 +626,7 @@ public: |
626 | 626 | { |
627 | 627 | writeHeader(filename); |
628 | 628 | std::ofstream file; |
629 | - file.open(filename, std::ios::out | std::ios::binary | std::ios::app); ///since we have written the header we are not appending. | |
629 | + file.open(filename.c_str(), std::ios::out | std::ios::binary | std::ios::app); ///since we have written the header we are not appending. | |
630 | 630 | for(int i = 0; i < V.size(); i++) ///look through the Vertices and write each one. |
631 | 631 | { |
632 | 632 | // std::cout << i << " " << V[i].str() << std::endl; |
... | ... | @@ -650,7 +650,7 @@ public: |
650 | 650 | int hNumVertices = V.size(); ///int byte header storing the number of vertices in the file |
651 | 651 | int hNumEdges = E.size(); ///int byte header storing the number of edges. |
652 | 652 | std::ofstream file; |
653 | - file.open(filename, std::ios::out | std::ios::binary); | |
653 | + file.open(filename.c_str(), std::ios::out | std::ios::binary); | |
654 | 654 | std::cout << hNumVertices << " " << hNumEdges << std::endl; |
655 | 655 | file.write(reinterpret_cast<const char*>(&magicString.c_str()[0]), 14); //write the file id |
656 | 656 | file.write(reinterpret_cast<const char*>(&desc.c_str()[0]), 58); //write the description |
... | ... | @@ -670,7 +670,7 @@ public: |
670 | 670 | int hNumVertices; ///#vert |
671 | 671 | int hNumEdges; ///#edges |
672 | 672 | std::ifstream file; ////create stream |
673 | - file.open(filename, std::ios::in | std::ios::binary); | |
673 | + file.open(filename.c_str(), std::ios::in | std::ios::binary); | |
674 | 674 | file.read(reinterpret_cast<char*>(&magicString[0]), 14); ///read the file id. |
675 | 675 | file.read(reinterpret_cast<char*>(&desc[0]), 58); ///read the description |
676 | 676 | file.read(reinterpret_cast<char*>(&hNumVertices), sizeof(int)); ///read the number of vertices | ... | ... |