Pulled in changes from master branch

makefile-internal

@@ -1,8 +1,8 @@
 64BIT_VERSION ?= yes
 USEREADLINE ?= yes
 USEBOOST ?= yes
-RELEASE_DATE = "\"4/11/2016\""
-VERSION = "\"1.37.0\""
+RELEASE_DATE = "\"5/11/2016\""
+VERSION = "\"1.37.4\""
 
 # Optimize to level 3:
     CXXFLAGS += -O3

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) {
-			double temp = -10.0;
-
-			if ((*it != "unique") && (convertTestFloat(*it, temp) == true))	{	convert(*it, temp);	}
-			else if (*it == "unique")										{	temp = -1.0;		}
+        //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 (temp <= cutoff) {
-				orderFloat.push_back(temp);
-				labelBin[temp] = numSingleBins; //initialize numbins 
-			}
-		}
+            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());

source/vsearchfileparser.cpp

@@ -174,7 +174,7 @@ int VsearchFileParser::createListFile(string inputFile, string listFile, string
             in >> recordType >> clusterNumber >> length >> percentIdentity >> strand >> notUsed1 >> notUsed2 >> compressedAlignment >> seqName >> repSequence; m->gobble(in);
             
             if (recordType != "S") {
-            
+                
                 seqName = removeAbundances(seqName);
                 
                 if (format == "name") {
@@ -189,6 +189,7 @@ int VsearchFileParser::createListFile(string inputFile, string listFile, string
                 list.set(clusterNumber, bin);
                 
             }
+            
         }
         in.close();