Fixes during windows build

Removes sorting of OTUs from user inputed list files
Only sort mothur generated files Bug Fix
Only sort mothur generated files Bug Fix
mothur · mothur-westcott · mothur-westcott · mothur-westcott · mothur-westcott · mothur-westcott
diff --git a/Makefile b/Makefile
@@ -13,9 +13,10 @@ OPTIMIZE ?= yes
 USEREADLINE ?= yes
 USEBOOST ?= yes
 BOOST_LIBRARY_DIR="\"Enter_your_boost_library_path_here\""
+BOOST_INCLUDE_DIR="\"Enter_your_boost_include_path_here\""
 MOTHUR_FILES="\"Enter_your_default_path_here\""
-RELEASE_DATE = "\"4/05/2016\""
-VERSION = "\"1.37.0\""
+RELEASE_DATE = "\"6/20/2016\""
+VERSION = "\"1.37.6\""
 
 ifeq  ($(strip $(64BIT_VERSION)),yes)
     CXXFLAGS += -DBIT_VERSION
@@ -44,17 +45,13 @@ ifeq  ($(strip $(USEREADLINE)),yes)
 endif
 
 
-#The boost libraries allow you to read gz files.
+#User specified boost library
 ifeq  ($(strip $(USEBOOST)),yes)
 
-#User specified boost library path
-ifeq  ($(strip $(BOOST_LIBRARY_DIR)),"\"Enter_your_boost_library_path_here\"")
-else
-    LDFLAGS += ${BOOST_LIBRARY_DIR}
-endif
+    LDFLAGS += -L ${BOOST_LIBRARY_DIR}
 
     LIBS += -lboost_iostreams -lz
-    CXXFLAGS += -DUSE_BOOST
+    CXXFLAGS += -DUSE_BOOST -I ${BOOST_INCLUDE_DIR}
 endif
 
 #
diff --git a/Mothur.xcodeproj/project.pbxproj b/Mothur.xcodeproj/project.pbxproj
diff --git a/makefile-internal b/makefile-internal
@@ -1,16 +1,16 @@
 64BIT_VERSION ?= yes
 USEREADLINE ?= yes
 USEBOOST ?= yes
-RELEASE_DATE = "\"4/05/2015\""
-VERSION = "\"1.37.0\""
+RELEASE_DATE = "\"5/11/2016\""
+VERSION = "\"1.37.4\""
 
 # Optimize to level 3:
     CXXFLAGS += -O3
 
 
 ifeq  ($(strip $(64BIT_VERSION)),yes)
     #if you are a mac user use the following line
-    #TARGET_ARCH += -arch x86_64
+    TARGET_ARCH += -arch x86_64
 
     #if you using cygwin to build Windows the following line
     #CXX = x86_64-w64-mingw32-g++
@@ -40,12 +40,12 @@ ifeq  ($(strip $(USEBOOST)),yes)
     BOOST_INCLUDE_DIR="/usr/local/include"
     BOOST_LIBRARY_DIR="/usr/local/lib"
 
-    CXXFLAGS += -DUSE_BOOST
+    CXXFLAGS += -DUSE_BOOST -I ${BOOST_INCLUDE_DIR}
 
     LIBS += ${BOOST_LIBRARY_DIR}/libboost_iostreams.a
 
     #if mac
-    LIBS += ${BOOST_LIBRARY_DIR}/zlib.a
+    LIBS += -lz
 
     #if linux or windows
     #LIBS += ${BOOST_LIBRARY_DIR}/libz.a
diff --git a/source/classifier/phylosummary.cpp b/source/classifier/phylosummary.cpp
@@ -454,7 +454,7 @@ void PhyloSummary::print(ofstream& out, string output){
         
         //print labels
         if (output == "detail") {   out << "taxlevel\trankID\ttaxon\tdaughterlevels\ttotal";  }
-        else                    {   out << "taxon\ttotal";  }
+        else                    {   out << "taxonomy\ttotal";  }
         
         if (printlevel == -1) { printlevel = maxLevel; }
         else if (printlevel > maxLevel) { m->mothurOut("[WARNING]: Your printlevel is greater than your maxlevel, adjusting your printlevel to " + toString(maxLevel) + "\n"); printlevel = maxLevel; }
@@ -501,46 +501,42 @@ void PhyloSummary::print(ofstream& out, string output){
                 if (output == "detail") {
                     out << tree[0].level << "\t" << tree[0].rank << "\t" << tree[0].name << "\t" << totalChildrenInTree << "\t" << (tree[0].total/(double) tree[0].total);
                 }else{
-                    //if (totalChildrenInTree == 0) { //leaf node - we want to print it. Use rank to find full taxonomy
-                        //out << findTaxon(tree[0].rank) << '\t' << tree[0].total;
-                   // }
+                    out << tree[0].name << "\t" << (tree[0].total/(double) tree[0].total);
                 }
                 
-                if ((output == "detail")) {
-                    if (groupmap != NULL) {
+                
+                if (groupmap != NULL) {
+                    for (int i = 0; i < mGroups.size(); i++) {
+                        double thisNum = tree[0].groupCount[mGroups[i]];
+                        thisNum /= (double) groupmap->getNumSeqs(mGroups[i]);
+                        out  << '\t' << thisNum;
+                    }
+                }else if ( ct != NULL) {
+                    if (ct->hasGroupInfo()) {
                         for (int i = 0; i < mGroups.size(); i++) {
                             double thisNum = tree[0].groupCount[mGroups[i]];
-                            thisNum /= (double) groupmap->getNumSeqs(mGroups[i]);
+                            thisNum /= (double) ct->getGroupCount(mGroups[i]);
                             out  << '\t' << thisNum;
                         }
-                    }else if ( ct != NULL) {
-                        if (ct->hasGroupInfo()) {
-                            for (int i = 0; i < mGroups.size(); i++) {
-                                double thisNum = tree[0].groupCount[mGroups[i]];
-                                thisNum /= (double) ct->getGroupCount(mGroups[i]);
-                                out  << '\t' << thisNum;
-                            }
-                        }
                     }
-                    out << endl;
                 }
+                out << endl;
+               
                 
             }else {
                 if (output == "detail") {
                     out << tree[0].level << "\t" << tree[0].rank << "\t" << tree[0].name << "\t" << totalChildrenInTree << "\t" << tree[0].total;
                 }else{
-                    if (totalChildrenInTree == 0) { //leaf node - we want to print it. Use rank to find full taxonomy
-                        out << findTaxon(tree[0].rank) << '\t' << tree[0].total;
-                    }
+                    out << tree[0].name << '\t' << tree[0].total;
                 }
-                if ((output == "detail")) {
-                    if (groupmap != NULL) {
-                        for (int i = 0; i < mGroups.size(); i++) {  out  << '\t'<< tree[0].groupCount[mGroups[i]]; }
-                    }else if ( ct != NULL) {
-                        if (ct->hasGroupInfo()) { for (int i = 0; i < mGroups.size(); i++) {  out  << '\t' << tree[0].groupCount[mGroups[i]]; } }
-                    }
-                    out << endl;
+                
+                if (groupmap != NULL) {
+                    for (int i = 0; i < mGroups.size(); i++) {  out  << '\t'<< tree[0].groupCount[mGroups[i]]; }
+                }else if ( ct != NULL) {
+                    if (ct->hasGroupInfo()) { for (int i = 0; i < mGroups.size(); i++) {  out  << '\t' << tree[0].groupCount[mGroups[i]]; } }
                 }
+                out << endl;
+                
             }
         
         
diff --git a/source/commands/chimerauchimecommand.cpp b/source/commands/chimerauchimecommand.cpp
@@ -690,7 +690,7 @@ int ChimeraUchimeCommand::execute(){
 				if (error == 1) { for (int j = 0; j < outputNames.size(); j++) {	m->mothurRemove(outputNames[j]);	}  return 0; }
 				if (seqs.size() != nameMapCount.size()) { m->mothurOut( "The number of sequences in your fastafile does not match the number of sequences in your namefile, aborting."); m->mothurOutEndLine(); for (int j = 0; j < outputNames.size(); j++) {	m->mothurRemove(outputNames[j]);	}  return 0; }
 				
-				m->printVsearchFile(nameMapCount, newFasta);
+                m->printVsearchFile(nameMapCount, newFasta, "ab");
 				fastaFileNames[s] = newFasta;
 			}
 			
diff --git a/source/commands/clusterdoturcommand.cpp b/source/commands/clusterdoturcommand.cpp
@@ -366,7 +366,7 @@ void ClusterDoturCommand::printData(string label, map<string, int>& counts){
         if(countfile != "") {
             oldList.print(listFile, counts);
         }else {
-            oldList.print(listFile);
+            oldList.print(listFile, true);
         }
 
 	}
diff --git a/source/commands/clustersplitcommand.cpp b/source/commands/clustersplitcommand.cpp
@@ -616,18 +616,21 @@ map<float, int> ClusterSplitCommand::completeListFile(vector<string> listNames,
 			numSingleBins = listSingle->getNumBins();
 		}else{  listSingle = NULL; numSingleBins = 0;  }
 		
-		//go through users set and make them floats so we can sort them 
-		for(set<string>::iterator it = userLabels.begin(); it != userLabels.end(); ++it) {
-			float temp = -10.0;
-
-			if ((*it != "unique") && (convertTestFloat(*it, temp) == true))	{	convert(*it, temp);	}
-			else if (*it == "unique")										{	temp = -1.0;		}
-			
-			if (temp <= cutoff) {
-				orderFloat.push_back(temp);
-				labelBin[temp] = numSingleBins; //initialize numbins 
-			}
-		}
+        //go through users set and make them floats so we can sort them
+        double tcutoff = cutoff * 1000; tcutoff = ceil(tcutoff);
+        for(set<string>::iterator it = userLabels.begin(); it != userLabels.end(); ++it) {
+            double temp = -10.0;
+            
+            if ((*it != "unique") && (convertTestFloat(*it, temp) == true))	{	m->mothurConvert(*it, temp);	}
+            else if (*it == "unique")										{	temp = -1.0;		}
+            
+            double ttemp = temp * 1000; ttemp = ceil(temp);
+            
+            if (ttemp <= tcutoff) {
+                orderFloat.push_back(temp);
+                labelBin[temp] = numSingleBins; //initialize numbins 
+            }
+        }
 	
 		//sort order
 		sort(orderFloat.begin(), orderFloat.end());
@@ -677,7 +680,7 @@ map<float, int> ClusterSplitCommand::completeListFile(vector<string> listNames,
 				
 				//print to new file
 				list->setLabel(thisLabel);
-				list->print(outFilled);
+				list->print(outFilled, true);
 		
 				//update labelBin
 				labelBin[orderFloat[l]] += list->getNumBins();
@@ -832,7 +835,7 @@ void ClusterSplitCommand::printData(ListVector* oldList){
 		oldRAbund.print(outRabund);
 		oldRAbund.getSAbundVector().print(outSabund);
 	
-		oldList->print(outList);
+		oldList->print(outList, true);
 	}
 	catch(exception& e) {
 		m->errorOut(e, "ClusterSplitCommand", "printData");
diff --git a/source/commands/getgroupscommand.cpp b/source/commands/getgroupscommand.cpp
@@ -700,7 +700,7 @@ int GetGroupsCommand::readList(){
 				wroteSomething = true;
                 newList.setLabels(newBinLabels);
                 newList.printHeaders(out);
-				newList.print(out);
+				newList.print(out, false);
 			}
 			
 			m->gobble(in);
diff --git a/source/commands/getlineagecommand.cpp b/source/commands/getlineagecommand.cpp
@@ -595,7 +595,7 @@ int GetLineageCommand::readList(){
 				wroteSomething = true;
 				newList.setLabels(newBinLabels);
                 newList.printHeaders(out);
-				newList.print(out);
+				newList.print(out, false);
 			}
 			
 			m->gobble(in);
diff --git a/source/commands/getotulabelscommand.cpp b/source/commands/getotulabelscommand.cpp
@@ -554,7 +554,7 @@ int GetOtuLabelsCommand::readList(){
             wroteSomething = true;
             newList.setLabels(newLabels);
             newList.printHeaders(out);
-            newList.print(out);
+            newList.print(out, false);
         }
 		out.close();
 		
diff --git a/source/commands/getseqscommand.cpp b/source/commands/getseqscommand.cpp
@@ -793,7 +793,7 @@ int GetSeqsCommand::readList(){
 				wroteSomething = true;
 				newList.setLabels(newBinLabels);
                 newList.printHeaders(out);
-				newList.print(out);
+				newList.print(out, false);
 			}
 			
 			m->gobble(in);