fixed some bugs

[mothur.git] / heatmap.h

diff --git a/heatmap.h b/heatmap.h
index 54035f0cb4aba4e595183d3f8b6ae9e0ce256bc9..7c5b561c84ade9012c49171b4b9f0b0d765b9724 100644 (file)
--- a/heatmap.h
+++ b/heatmap.h
@@ -9,15 +9,10 @@
  *
  */
 
-using namespace std;
-
-#include "ordervector.hpp"
 #include "rabundvector.hpp"
 #include "sharedrabundvector.h"
-#include "sharedordervector.h"
 #include "datavector.hpp"
 #include "globaldata.hpp"
-#include "sharedutilities.h"
 
 /***********************************************************************/
 
@@ -25,29 +20,25 @@ class HeatMap {
        
        public:
                HeatMap();
-               ~HeatMap(){ delete util; };
+               ~HeatMap(){};
        
-               void getPic(OrderVector*);
-               void getPic(SharedOrderVector*);
+               void getPic(RAbundVector*);
+               void getPic(vector<SharedRAbundVector*>);
 
        private:
-               void sortSharedVectors();
+               void sortSharedVectors(vector<SharedRAbundVector*>& );
                void printLegend(int, float);
-               
+
                GlobalData* globaldata;
-               SharedUtil* util;
-               vector<SharedRAbundVector*> lookup;
-               RAbundVector rabund;
                string format, sorted, groupComb, scaler;
                ofstream outsvg;
-               map<float, string> colorScale;
-               map<float, string>::iterator it;
-
                        
 };
+
 /***********************************************************************/
 
 #endif
 
 
 
+