changed random forest output filename

[mothur.git] / listvector.cpp

diff --git a/listvector.cpp b/listvector.cpp
index 94ca02662bc1e59f61312e7c33d2244faa30e3ae..2758c94264a1ba527e8d7c3970e0bac53254579b 100644 (file)
--- a/listvector.cpp
+++ b/listvector.cpp
@@ -13,6 +13,27 @@
 #include "ordervector.hpp"
 #include "listvector.hpp"
 
+//sorts highest to lowest
+/***********************************************************************/
+inline bool abundNamesSort(string left, string right){
+    
+    int countLeft = 0;
+    if(left != ""){
+        countLeft = 1;
+        for(int i=0;i<left.size();i++){  if(left[i] == ','){  countLeft++;  }  }
+    }
+    
+    int countRight = 0;
+    if(right != ""){
+        countRight = 1;
+        for(int i=0;i<right.size();i++){  if(right[i] == ','){  countRight++;  }  }
+    }
+    
+       if (countLeft > countRight) {
+        return true;
+    }
+    return false;      
+} 
 
 /***********************************************************************/
 
@@ -28,7 +49,7 @@ ListVector::ListVector(string id, vector<string> lv) : DataVector(id), data(lv){
        try {
                for(int i=0;i<data.size();i++){
                        if(data[i] != ""){
-                               int binSize = getNumNames(data[i]);
+                               int binSize = m->getNumNames(data[i]);
                                numBins = i+1;
                                if(binSize > maxRank)   {       maxRank = binSize;      }
                                numSeqs += binSize;
@@ -55,8 +76,7 @@ ListVector::ListVector(ifstream& f) : DataVector(), maxRank(0), numBins(0), numS
                        f >> inputData;
                        set(i, inputData);
                }
-               
-               gobble(f);
+               m->gobble(f);
        }
        catch(exception& e) {
                m->errorOut(e, "ListVector", "ListVector");
@@ -68,9 +88,9 @@ ListVector::ListVector(ifstream& f) : DataVector(), maxRank(0), numBins(0), numS
 
 void ListVector::set(int binNumber, string seqNames){
        try {
-               int nNames_old = getNumNames(data[binNumber]);
+               int nNames_old = m->getNumNames(data[binNumber]);
                data[binNumber] = seqNames;
-               int nNames_new = getNumNames(seqNames);
+               int nNames_new = m->getNumNames(seqNames);
        
                if(nNames_old == 0)                     {       numBins++;                              }
                if(nNames_new == 0)                     {       numBins--;                              }
@@ -95,7 +115,7 @@ string ListVector::get(int index){
 void ListVector::push_back(string seqNames){
        try {
                data.push_back(seqNames);
-               int nNames = getNumNames(seqNames);
+               int nNames = m->getNumNames(seqNames);
        
                numBins++;
        
@@ -136,9 +156,12 @@ void ListVector::print(ostream& output){
        try {
                output << label << '\t' << numBins << '\t';
        
-               for(int i=0;i<data.size();i++){
-                       if(data[i] != ""){
-                               output << data[i] << '\t';
+        vector<string> hold = data;
+        sort(hold.begin(), hold.end(), abundNamesSort);
+        
+               for(int i=0;i<hold.size();i++){
+                       if(hold[i] != ""){
+                               output << hold[i] << '\t';
                        }
                }
                output << endl;
@@ -157,7 +180,7 @@ RAbundVector ListVector::getRAbundVector(){
                RAbundVector rav;
        
                for(int i=0;i<data.size();i++){
-                       int binSize = getNumNames(data[i]);
+                       int binSize = m->getNumNames(data[i]);
                        rav.push_back(binSize);
                }
        
@@ -187,7 +210,7 @@ SAbundVector ListVector::getSAbundVector(){
                SAbundVector sav(maxRank+1);
        
                for(int i=0;i<data.size();i++){
-                       int binSize = getNumNames(data[i]);     
+                       int binSize = m->getNumNames(data[i]);  
                        sav.set(binSize, sav.get(binSize) + 1); 
                }
                sav.set(0, 0);
@@ -210,7 +233,7 @@ OrderVector ListVector::getOrderVector(map<string,int>* orderMap = NULL){
                        OrderVector ov;
                
                        for(int i=0;i<data.size();i++){
-                               int binSize = getNumNames(data[i]);             
+                               int binSize = m->getNumNames(data[i]);          
                                for(int j=0;j<binSize;j++){
                                        ov.push_back(i);
                                }