From: westcott <westcott>
Date: Fri, 16 Apr 2010 14:55:17 +0000 (+0000)
Subject: 1.9
X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=commitdiff_plain;h=438aa88dbc092d9c1c80ec3fa20c8e47f97101c4

1.9
---

diff --git a/makefile b/makefile
index 451d613..9915286 100644
--- a/makefile
+++ b/makefile
@@ -2,7 +2,7 @@
 #
 # Makefile for mothur
 # Creator [Xcode -> Makefile Ver: Feb 14 2007 09:18:41]
-# Created: [Thu Mar  4 08:31:03 2010]
+# Created: April 16, 2010
 #
 ###################################################
 
@@ -27,7 +27,7 @@ ifeq  ($(strip $(USEREADLINE)),yes)
       -L../readline-6.0
 endif
 
-USEMPI ?= no
+USEMPI ?= yes
 
 ifeq  ($(strip $(USEMPI)),yes)
     CC_OPTIONS += -DUSE_MPI
diff --git a/mothur.cpp b/mothur.cpp
index cb72ac6..2d35c69 100644
--- a/mothur.cpp
+++ b/mothur.cpp
@@ -75,7 +75,7 @@ int main(int argc, char *argv[]){
 		//header
 		m->mothurOut("mothur v.1.9");
 		m->mothurOutEndLine();		
-		m->mothurOut("Last updated: 4/09/2010");
+		m->mothurOut("Last updated: 4/16/2010");
 		m->mothurOutEndLine();	
 		m->mothurOutEndLine();		
 		m->mothurOut("by");
diff --git a/unifracunweightedcommand.cpp b/unifracunweightedcommand.cpp
index 28bc2ac..77cd4d7 100644
--- 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 cd7fec1..f092b0f 100644
--- 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++;
 				}
 			}