X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=bayesian.cpp;h=6eaab6f2f974f8e1036561c2f76d9587d6dd0399;hp=bccf0ce0dda18501c129b7604546f4e9fc43382b;hb=1a20e24ee786195ab0e1cccd4f5aede7a88f3f4e;hpb=5b72d1cf3fa48730e5bb70d59cced1e43e1fe424

diff --git a/bayesian.cpp b/bayesian.cpp
index bccf0ce..6eaab6f 100644
--- a/bayesian.cpp
+++ b/bayesian.cpp
@@ -64,7 +64,7 @@ Classify(), kmerSize(ksize), confidenceThreshold(cutoff), iters(i) {
 			}
 			saveIn.close();			
 		}
-FilesGood = false;
+
 		if(probFileTest && probFileTest2 && phyloTreeTest && probFileTest3 && FilesGood){	
 			if (tempFile == "saved") { m->mothurOutEndLine();  m->mothurOut("Using sequences from " + rdb->getSavedReference() + " that are saved in memory.");	m->mothurOutEndLine(); }
 			
@@ -143,7 +143,6 @@ FilesGood = false;
 					}
 				#endif
 
-				
 				//for each word
 				for (int i = 0; i < numKmers; i++) {
 					if (m->control_pressed) {  break; }
@@ -162,12 +161,10 @@ FilesGood = false;
 					
 					vector<int> seqsWithWordi = database->getSequencesWithKmer(i);
 					
-					map<int, int> count;
-					for (int k = 0; k < genusNodes.size(); k++) {  count[genusNodes[k]] = 0;  }			
-							
 					//for each sequence with that word
+                    vector<int> count; count.resize(genusNodes.size(), 0);
 					for (int j = 0; j < seqsWithWordi.size(); j++) {
-						int temp = phyloTree->getIndex(names[seqsWithWordi[j]]);
+						int temp = phyloTree->getGenusIndex(names[seqsWithWordi[j]]);
 						count[temp]++;  //increment count of seq in this genus who have this word
 					}
 					
@@ -181,9 +178,9 @@ FilesGood = false;
 						//probabilityInThisTaxonomy = (# of seqs with that word in this taxonomy + probabilityInTemplate) / (total number of seqs in this taxonomy + 1);
 						
 						
-						wordGenusProb[i][k] = log((count[genusNodes[k]] + probabilityInTemplate) / (float) (genusTotals[k] + 1));  
+						wordGenusProb[i][k] = log((count[k] + probabilityInTemplate) / (float) (genusTotals[k] + 1));  
 									
-						if (count[genusNodes[k]] != 0) { 
+						if (count[k] != 0) { 
 							#ifdef USE_MPI
 								int pid;
 								MPI_Comm_rank(MPI_COMM_WORLD, &pid); //find out who we are
@@ -258,9 +255,8 @@ FilesGood = false;
 /**************************************************************************************************/
 Bayesian::~Bayesian() {
 	try {
-		
-		 delete phyloTree; 
-		 if (database != NULL) {  delete database; }
+        if (phyloTree != NULL) { delete phyloTree; }
+        if (database != NULL) {  delete database; }
 	}
 	catch(exception& e) {
 		m->errorOut(e, "Bayesian", "~Bayesian");
@@ -312,7 +308,11 @@ string Bayesian::getTaxonomy(Sequence* seq) {
 		//bootstrap - to set confidenceScore
 		int numToSelect = queryKmers.size() / 8;
 	
+        if (m->debug) {  m->mothurOut(seq->getName() + "\t"); }
+        
 		tax = bootstrapResults(queryKmers, index, numToSelect);
+        
+        if (m->debug) {  m->mothurOut("\n"); }
 		
 		return tax;	
 	}
@@ -378,6 +378,7 @@ string Bayesian::bootstrapResults(vector<int> kmers, int tax, int numToSelect) {
 		int seqTaxIndex = tax;
 		TaxNode seqTax = phyloTree->get(tax);
 		
+        
 		while (seqTax.level != 0) { //while you are not at the root
 					
 				itBoot2 = confidenceScores.find(seqTaxIndex); //is this a classification we already have a count on
@@ -387,11 +388,13 @@ string Bayesian::bootstrapResults(vector<int> kmers, int tax, int numToSelect) {
 					confidence = itBoot2->second;
 				}
 				
+                if (m->debug) { m->mothurOut(seqTax.name + "(" + toString(((confidence/(float)iters) * 100)) + ");"); }
+            
 				if (((confidence/(float)iters) * 100) >= confidenceThreshold) {
 					confidenceTax = seqTax.name + "(" + toString(((confidence/(float)iters) * 100)) + ");" + confidenceTax;
 					simpleTax = seqTax.name + ";" + simpleTax;
 				}
-				
+            
 				seqTaxIndex = seqTax.parent;
 				seqTax = phyloTree->get(seqTax.parent);
 		}