X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=getlineagecommand.cpp;h=2a5505f149241c88b0591f1622a50d6a2fc89577;hb=a4f05f09c250323132a4b9427f41a3ededaec634;hp=5a30e1e2e3495e6a9e2c69c06c11d45c83baec5f;hpb=264c8a3c759d9a999c485236e98dac98d4f0db5f;p=mothur.git diff --git a/getlineagecommand.cpp b/getlineagecommand.cpp index 5a30e1e..2a5505f 100644 --- a/getlineagecommand.cpp +++ b/getlineagecommand.cpp @@ -571,7 +571,7 @@ int GetLineageCommand::readTax(){ //bool wroteSomething = false; bool taxonsHasConfidence = false; - vector< map > searchTaxons; + vector< map > searchTaxons; string noConfidenceTaxons = taxons; int hasConPos = taxons.find_first_of('('); if (hasConPos != string::npos) { @@ -629,7 +629,7 @@ int GetLineageCommand::readTax(){ if (pos != string::npos) { //if yes, then are the confidences okay bool good = true; - vector< map > usersTaxon = getTaxons(newtax); + vector< map > usersTaxon = getTaxons(newtax); //the usersTaxon is most likely longer than the searchTaxons, and searchTaxon[0] may relate to userTaxon[4] //we want to "line them up", so we will find the the index where the searchstring starts @@ -691,10 +691,10 @@ int GetLineageCommand::readTax(){ } } /**************************************************************************************************/ -vector< map > GetLineageCommand::getTaxons(string tax) { +vector< map > GetLineageCommand::getTaxons(string tax) { try { - vector< map > t; + vector< map > t; string taxon = ""; int taxLength = tax.length(); for(int i=0;i > GetLineageCommand::getTaxons(string tax) { newtaxon = taxon; confidence = "0"; } - int con = 0; + float con = 0; convert(confidence, con); - map temp; + map temp; temp[newtaxon] = con; t.push_back(temp);