test

[mothur.git] / heatmap.cpp

diff --git a/heatmap.cpp b/heatmap.cpp
index 52a29e79e70dde14806e79960de618b7c3b4e4bf..2bd020e0c3cf8337c0671c1db515954e51177dd0 100644 (file)
--- a/heatmap.cpp
+++ b/heatmap.cpp
@@ -10,12 +10,13 @@
 #include "heatmap.h"
 
 //**********************************************************************************************************************
-HeatMap::HeatMap(string sort, string scale){
+HeatMap::HeatMap(string sort, string scale, string dir){
        try {
                globaldata = GlobalData::getInstance();
 //             format = globaldata->getFormat();
                sorted = sort;
                scaler = scale;
+               outputDir = dir;
        }
        catch(exception& e) {
                errorOut(e, "HeatMap", "HeatMap");
@@ -57,7 +58,7 @@ void HeatMap::getPic(RAbundVector* rabund) {
                }
                
                
-               string filenamesvg = getRootName(globaldata->inputFileName) + rabund->getLabel() + ".heatmap.bin.svg";
+               string filenamesvg = outputDir + getRootName(getSimpleName(globaldata->inputFileName)) + rabund->getLabel() + ".heatmap.bin.svg";
                openOutputFile(filenamesvg, outsvg);
                
                //svg image
@@ -133,7 +134,7 @@ void HeatMap::getPic(vector<SharedRAbundVector*> lookup) {
                        }
                }
 
-               string filenamesvg = getRootName(globaldata->inputFileName) + lookup[0]->getLabel() + ".heatmap.bin.svg";
+               string filenamesvg = outputDir + getRootName(getSimpleName(globaldata->inputFileName)) + lookup[0]->getLabel() + ".heatmap.bin.svg";
                openOutputFile(filenamesvg, outsvg);
                
                //svg image
@@ -231,7 +232,7 @@ void HeatMap::sortSharedVectors(vector<SharedRAbundVector*>& lookup){
                        //fill lookup
                        for (int j = 0; j < looktemp.size(); j++) {
                                //if they are not shared then push to back, if they are not insert in front
-                               if (count < 2)  { lookup[j]->push_back(looktemp[j]->getAbundance(i), i, looktemp[j]->getGroup()); }
+                               if (count < 2)  { lookup[j]->push_back(looktemp[j]->getAbundance(i), looktemp[j]->getGroup()); }
                                //they are shared by some
                                else {  lookup[j]->insert(looktemp[j]->getAbundance(i), place[count], looktemp[j]->getGroup());   updatePlace = true; }
                        }