X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=normalizesharedcommand.h;h=bedff43da2532c99d2e672c27f0abc5a8ebbc9b8;hb=afeb767205e3e7efd11bb7a36a36ad79ad05a779;hp=22158bd6d5ff136d0df81d0304b476ec580b8b7a;hpb=99254b7a399bb635a4acfe8d9c8a586601db5a11;p=mothur.git

diff --git a/normalizesharedcommand.h b/normalizesharedcommand.h
index 22158bd..bedff43 100644
--- a/normalizesharedcommand.h
+++ b/normalizesharedcommand.h
@@ -12,7 +12,6 @@
  
 #include "command.hpp"
 #include "inputdata.h"
-#include "readotu.h"
 #include "sharedrabundvector.h"
 
 class GlobalData;
@@ -32,11 +31,11 @@ public:
 	
 private:
 	GlobalData* globaldata;
-	ReadOTUFile* read;
 	InputData* input;
 	vector<SharedRAbundVector*> lookup;
+	vector<SharedRAbundFloatVector*> lookupFloat;
 	
-	bool abort, allLines, pickedGroups;
+	bool abort, allLines, pickedGroups, makeRelabund;
 	set<string> labels; //holds labels to be used
 	string groups, label, outputDir, method;
 	int norm;
@@ -44,7 +43,9 @@ private:
 	map<string, vector<string> > outputTypes;
 	
 	int normalize(vector<SharedRAbundVector*>&, ofstream&);
-	int eliminateZeroOTUS(vector<SharedRAbundVector*>& thislookup);
+	int normalize(vector<SharedRAbundFloatVector*>&, ofstream&);
+	int eliminateZeroOTUS(vector<SharedRAbundVector*>&);
+	int eliminateZeroOTUS(vector<SharedRAbundFloatVector*>&);
 
 };