heatmap

[mothur.git] / sharedrabundvector.cpp

diff --git a/sharedrabundvector.cpp b/sharedrabundvector.cpp
index ba8f94d2e03b85589c62238748bc1b4fa8e01676..b35b06d05813f3819cefc2919f5fbb18b4b8c2af 100644 (file)
--- a/sharedrabundvector.cpp
+++ b/sharedrabundvector.cpp
@@ -11,10 +11,7 @@
 using namespace std;
 
 #include "sharedrabundvector.h" 
-#include "datavector.hpp"
 #include "utilities.hpp"
-#include <exception>
-#include "sharedrabundvector.h"
 #include "sabundvector.hpp"
 #include "ordervector.hpp"
 
@@ -65,10 +62,11 @@ SharedRAbundVector::SharedRAbundVector(string id, vector<individual> rav) : Data
 
 SharedRAbundVector::SharedRAbundVector(ifstream& f) : DataVector(), maxRank(0), numBins(0), numSeqs(0) {
        try {
-               int i, hold;
+               int i, num;
+               string holdLabel, group
                individual newGuy;
                
-               f >> label >> hold;
+               f >> label >> group >> num;
                
                //initialize data
                for (i=0; i<hold; i++) {
@@ -223,7 +221,10 @@ string SharedRAbundVector::getGroup(){
 void SharedRAbundVector::setGroup(string groupName){
        group = groupName;
 }
-
+/***********************************************************************/
+int SharedRAbundVector::getGroupIndex()  { return index; }
+/***********************************************************************/
+void SharedRAbundVector::setGroupIndex(int vIndex)     { index = vIndex; }
 /***********************************************************************/
 int SharedRAbundVector::getNumBins(){
        return numBins;