- while (estim.find_first_of('-') != -1) {
- individual = estim.substr(0,estim.find_first_of('-'));
- if ((estim.find_first_of('-')+1) <= estim.length()) { //checks to make sure you don't have dash at end of string
- estim = estim.substr(estim.find_first_of('-')+1, estim.length());
- container.insert(individual);
+ //if you are not a nexus file
+ if ((c = filehandle.peek()) != '#') {
+ while((c = filehandle.peek()) != ';') {
+ while ((c = filehandle.peek()) != ';') {
+ // get past comments
+ if(c == '[') {
+ comment = 1;
+ }
+ if(c == ']'){
+ comment = 0;
+ }
+ if((c == '(') && (comment != 1)){ break; }
+ filehandle.get();
+ }
+
+ readTreeString(filehandle);
+ }
+ //if you are a nexus file
+ }else if ((c = filehandle.peek()) == '#') {
+ string holder = "";
+
+ // get past comments
+ while(holder != "translate" && holder != "Translate"){
+ if(holder == "[" || holder == "[!"){
+ comment = 1;
+ }
+ if(holder == "]"){
+ comment = 0;
+ }
+ filehandle >> holder;
+
+ //if there is no translate then you must read tree string otherwise use translate to get names
+ if(holder == "tree" && comment != 1){
+ //pass over the "tree rep.6878900 = "
+ while (((c = filehandle.get()) != '(') && ((c = filehandle.peek()) != EOF) ) {;}
+
+ if (c == EOF ) { break; }
+ filehandle.putback(c); //put back first ( of tree.
+ readTreeString(filehandle);
+ break;
+ }
+ }
+
+ //use nexus translation rather than parsing tree to save time
+ if ((holder == "translate") || (holder == "Translate")) {
+cout << "there is a translate " << endl;
+ string number, name, h;
+ h = ""; // so it enters the loop the first time
+ while((h != ";") && (number != ";")) {
+ filehandle >> number;
+ filehandle >> name;
+
+ //c = , until done with translation then c = ;
+ h = name.substr(name.length()-1, name.length());
+ name.erase(name.end()-1); //erase the comma
+ Treenames.push_back(number);
+ }
+ if (number == ";") { Treenames.pop_back(); } //in case ';' from translation is on next line instead of next to last name