fixed segfault in unifrac with subsample. in progress of implementing a version of...

[mothur.git] / subsample.h

diff --git a/subsample.h b/subsample.h
index aaf52447b026127b27141bb8794a77a80f60c7f4..ef5c389a938820a61201d83629efc6b27c5237d8 100644 (file)
--- a/subsample.h
+++ b/subsample.h
@@ -26,13 +26,15 @@ class SubSample {
         vector<string> getSample(vector<SharedRAbundVector*>&, int); //returns the bin labels for the subsample, mothurOuts binlabels are preserved so you can run this multiple times. Overwrites original vector passed in, if you need to preserve it deep copy first.
         
         Tree* getSample(Tree*, TreeMap*, map<string, string>, int); //creates new subsampled tree, destroys treemap so copy if needed.
+        Tree* getSample(Tree*, TreeMap*, map<string, string>, int, map<string, string>); //creates new subsampled tree, destroys treemap so copy if needed.
     
     private:
     
         MothurOut* m;
         int eliminateZeroOTUS(vector<SharedRAbundVector*>&);
     
-        vector<string> getSample(TreeMap*, int); //returns map contains names of seqs in subsample -> group. 
+        vector<string> getSample(TreeMap*, vector<string>);
+        vector<string> getSample(TreeMap*, int); //names of seqs to include in sample tree 
         map<string, string> deconvolute(map<string, string> wholeSet, vector<string>& subsampleWanted); //returns new nameMap containing only subsampled names, and removes redundants from subsampled wanted because it makes the new nameMap.