]> git.donarmstrong.com Git - mothur.git/blobdiff - bayesian.cpp
added code to check path for uchime and catchall executables
[mothur.git] / bayesian.cpp
index eca63b1a9168613a92232777e520efcaa586f328..1dc38337aef1bcc3b695ff56e86061cdab58c13d 100644 (file)
@@ -27,7 +27,7 @@ Classify(), kmerSize(ksize), confidenceThreshold(cutoff), iters(i) {
                if (baseTName == "saved") { baseTName = rdb->getSavedTaxonomy(); }
                
                /************calculate the probablity that each word will be in a specific taxonomy*************/
-               string tfileroot = baseTName.substr(0,baseTName.find_last_of(".")+1);
+               string tfileroot = m->getFullPathName(baseTName.substr(0,baseTName.find_last_of(".")+1));
                string tempfileroot = m->getRootName(m->getSimpleName(baseName));
                string phyloTreeName = tfileroot + "tree.train";
                string phyloTreeSumName = tfileroot + "tree.sum";
@@ -230,7 +230,7 @@ Classify(), kmerSize(ksize), confidenceThreshold(cutoff), iters(i) {
                                delete phyloTree;
                                
                                phyloTree = new PhyloTree(phyloTreeTest, phyloTreeName);
-                               
+                
                                //save probabilities
                                if (rdb->save) { rdb->wordGenusProb = wordGenusProb; rdb->WordPairDiffArr = WordPairDiffArr; }
                        }
@@ -605,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;
 
                        }