1.9

diff --git a/makefile b/makefile
index 451d613a24d3e91dd025f6f584f63f9ec5a2404a..99152863384e31256a81f9e946862c588b2e6c58 100644 (file)
--- a/makefile
+++ b/makefile
@@ -2,7 +2,7 @@
 #\r
 # Makefile for mothur\r
 # Creator [Xcode -> Makefile Ver: Feb 14 2007 09:18:41]\r
-# Created: [Thu Mar  4 08:31:03 2010]\r
+# Created: April 16, 2010\r
 #\r
 ###################################################\r
 \r
@@ -27,7 +27,7 @@ ifeq  ($(strip $(USEREADLINE)),yes)
       -L../readline-6.0\r
 endif\r
 \r
-USEMPI ?= no\r
+USEMPI ?= yes\r
 \r
 ifeq  ($(strip $(USEMPI)),yes)\r
     CC_OPTIONS += -DUSE_MPI\r

diff --git a/mothur.cpp b/mothur.cpp
index cb72ac635299285b9fe0775833e6fed18ae1369d..2d35c698cdb8bbcbb9a910a7b4c5e96f3fbd42f5 100644 (file)
--- a/mothur.cpp
+++ b/mothur.cpp
@@ -75,7 +75,7 @@ int main(int argc, char *argv[]){
                //header\r
                m->mothurOut("mothur v.1.9");\r
                m->mothurOutEndLine();          \r
-               m->mothurOut("Last updated: 4/09/2010");\r
+               m->mothurOut("Last updated: 4/16/2010");\r
                m->mothurOutEndLine();  \r
                m->mothurOutEndLine();          \r
                m->mothurOut("by");\r

diff --git a/unifracunweightedcommand.cpp b/unifracunweightedcommand.cpp
index 28bc2ac55f64ebb02185a55d43ba9ea8e6faa03b..77cd4d7d686ed5607c11eb07d2245c62f2ef2deb 100644 (file)
--- a/unifracunweightedcommand.cpp
+++ b/unifracunweightedcommand.cpp
@@ -336,8 +336,8 @@ void UnifracUnweightedCommand::createPhylipFile(int i) {
                int count = 0;
                for (int r=0; r<globaldata->Groups.size(); r++) { 
                        for (int l = r+1; l < globaldata->Groups.size(); l++) {
-                               dists[r][l] = (1.0 - utreeScores[count][0]);
-                               dists[l][r] = (1.0 - utreeScores[count][0]);
+                               dists[r][l] = utreeScores[count][0];
+                               dists[l][r] = utreeScores[count][0];
                                count++;
                        }
                }

diff --git a/unifracweightedcommand.cpp b/unifracweightedcommand.cpp
index cd7fec12320e3ee50e415a348df4a5b503e35763..f092b0f2cf03c8e00d70e437af2219ad9c8def44 100644 (file)
--- a/unifracweightedcommand.cpp
+++ b/unifracweightedcommand.cpp
@@ -365,8 +365,8 @@ void UnifracWeightedCommand::createPhylipFile() {
                        //flip it so you can print it
                        for (int r=0; r<globaldata->Groups.size(); r++) { 
                                for (int l = r+1; l < globaldata->Groups.size(); l++) {
-                                       dists[r][l] = (1.0 - utreeScores[count]);
-                                       dists[l][r] = (1.0 - utreeScores[count]);
+                                       dists[r][l] = utreeScores[count];
+                                       dists[l][r] = utreeScores[count];
                                        count++;
                                }
                        }