X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=sharedrabundvector.cpp;h=b35b06d05813f3819cefc2919f5fbb18b4b8c2af;hb=5318771152ee5b1a280b3dc50aedd887dd1da8a8;hp=a703e5577bbfa12cec108ade6c7e0e98b50ba7b5;hpb=44c1323a88b2a697c7047df1b3bb8c59eadd15b1;p=mothur.git

diff --git a/sharedrabundvector.cpp b/sharedrabundvector.cpp
index a703e55..b35b06d 100644
--- 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++) {