removed read.dist, read.otu, read.tree and globaldata. added current to defaults...

[mothur.git] / blastalign.cpp

diff --git a/blastalign.cpp b/blastalign.cpp
index 5e7fb61aa77e7c34ca7367393766b1a5455c9213..9af31dfa3e65e130d0bc347600aa28405f94b7f4 100644 (file)
--- a/blastalign.cpp
+++ b/blastalign.cpp
@@ -18,12 +18,11 @@
 
 //**************************************************************************************************/
 
-BlastAlignment::BlastAlignment(float go, float ge, float m, float mm) : 
-                       match(m),                               //      This is the score to award for two nucleotides matching (match >= 0)
+BlastAlignment::BlastAlignment(float go, float ge, float ma, float mm) : 
+                       match(ma),                              //      This is the score to award for two nucleotides matching (match >= 0)
                        mismatch(mm)                    //      This is the penalty to assess for a mismatch (mismatch <= 0)
 {
-       globaldata = GlobalData::getInstance();
-       path = globaldata->argv;
+       path = m->argv;
        path = path.substr(0, (path.find_last_of('m')));
        
        gapOpen = abs(go);                              //      This is the penalty to assess for opening a gap (gapOpen >= 0)