X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=consensuscommand.h;h=145bea5bdaf24410229cb42e889e7f02cacdd9c8;hb=7e354c9abb09ea3cf5b500a16cc7f6dd79ccb6f5;hp=53b8094b440be3e757bff24209ca97022a7433df;hpb=92dde9a6d6c638fcbbd5dbaa5c79167564f90e49;p=mothur.git diff --git a/consensuscommand.h b/consensuscommand.h index 53b8094..145bea5 100644 --- a/consensuscommand.h +++ b/consensuscommand.h @@ -35,6 +35,8 @@ private: // ie. combos FI and EGK would create nodePairs[vector containing F and I] = 1; nodePairs[vector containing E, G and K] = 1 // if you saw the combo FI again in another tree you would then update nodePairs[vector containing F and I] = 2; // requires vectors to be sorted to find key. + map< vector, vector< vector > > bestSplit; //maps a group to its best split + map< vector, int > nodePairsInitialRate; map< vector, int > nodePairsInTree; map::iterator it; map< vector, int>::iterator it2; @@ -43,7 +45,9 @@ private: int numNodes, numLeaves, count; //count is the next available spot in the tree vector void getSets(); - vector getNextAvailableSet(vector); //gets next largest and highest rated set that is a subset of the set passed in. + int getSubgroupRating(vector); + vector getSmallest(map< vector, int>); + vector getNextAvailableSet(vector, vector&); vector getRestSet(vector, vector); bool isSubset(vector, vector); int findSpot(string);