Merge remote-tracking branch 'mothur/master'

[mothur.git] / bayesian.cpp

diff --git a/bayesian.cpp b/bayesian.cpp
index f7ea6e4351868a20a191169b995e94faff6fa053..54a123c5a7835d7c1a2c48d36fe3ec7070462027 100644 (file)
--- a/bayesian.cpp
+++ b/bayesian.cpp
@@ -111,10 +111,9 @@ Classify(), kmerSize(ksize), confidenceThreshold(cutoff), iters(i) {
                                //initialze probabilities
                                wordGenusProb.resize(numKmers);
                                WordPairDiffArr.resize(numKmers);
-                       //cout << numKmers << '\t' << genusNodes.size() << endl;
+                       
                                for (int j = 0; j < wordGenusProb.size(); j++) {        wordGenusProb[j].resize(genusNodes.size());             }
-                       //cout << numKmers << '\t' << genusNodes.size() << endl;        
-                               ofstream out;
+                    ofstream out;
                                ofstream out2;
                                
                                #ifdef USE_MPI
@@ -505,7 +504,7 @@ map<string, int> Bayesian::parseTaxMap(string newTax) {
                exit(1);
        }
 }
-/**************************************************************************************************/
+**************************************************************************************************/
 void Bayesian::readProbFile(ifstream& in, ifstream& inNum, string inName, string inNumName) {
        try{
                
@@ -606,7 +605,7 @@ void Bayesian::readProbFile(ifstream& in, ifstream& inNum, string inName, string
                                istringstream iss (tempBuf,istringstream::in);
                                float probTemp;
                                iss >> zeroCountProb[i] >> numbers[i] >> probTemp; 
-                               WordPairDiffArr[i].prob = tempProb;
+                               WordPairDiffArr[i].prob = probTemp;
 
                        }