#include "rarefactsharedcommand.h"
#include "sharedsobs.h"
+#include "sharednseqs.h"
//**********************************************************************************************************************
if (validCalculator->isValidCalculator("sharedrarefaction", globaldata->Estimators[i]) == true) {
if (globaldata->Estimators[i] == "sharedobserved") {
rDisplays.push_back(new RareDisplay(new SharedSobs(), new SharedThreeColumnFile(fileNameRoot+"shared.rarefaction", "")));
+ }else if (globaldata->Estimators[i] == "sharednseqs") {
+ rDisplays.push_back(new RareDisplay(new SharedNSeqs(), new SharedThreeColumnFile(fileNameRoot+"shared.r_nseqs", "")));
}
+
}
}
//**********************************************************************************************************************
RareFactSharedCommand::~RareFactSharedCommand(){
- delete order;
delete input;
delete rCurve;
delete read;
//if the users entered no valid calculators don't execute command
if (rDisplays.size() == 0) { return 0; }
- if (format == "sharedfile") {
- read = new ReadPhilFile(globaldata->inputFileName);
- read->read(&*globaldata);
+ read = new ReadOTUFile(globaldata->inputFileName);
+ read->read(&*globaldata);
- input = globaldata->ginput;
- order = input->getSharedOrderVector();
- }else {
- //you are using a list and a groupfile
- read = new ReadPhilFile(globaldata->inputFileName);
- read->read(&*globaldata);
+ input = globaldata->ginput;
+ lookup = input->getSharedRAbundVectors();
- input = globaldata->ginput;
- SharedList = globaldata->gSharedList;
- order = SharedList->getSharedOrderVector();
+ if (lookup.size() < 2) {
+ cout << "I cannot run the command without at least 2 valid groups.";
+ for (int i = 0; i < lookup.size(); i++) { delete lookup[i]; }
+ return 0;
}
+
- while(order != NULL){
+ while(lookup[0] != NULL){
- if(globaldata->allLines == 1 || globaldata->lines.count(count) == 1 || globaldata->labels.count(order->getLabel()) == 1){
+ if(globaldata->allLines == 1 || globaldata->lines.count(count) == 1 || globaldata->labels.count(lookup[0]->getLabel()) == 1){
//create collectors curve
- rCurve = new Rarefact(order, rDisplays);
+ rCurve = new Rarefact(lookup, rDisplays);
convert(globaldata->getFreq(), freq);
convert(globaldata->getIters(), nIters);
rCurve->getSharedCurve(freq, nIters);
delete rCurve;
- cout << order->getLabel() << '\t' << count << endl;
+ cout << lookup[0]->getLabel() << '\t' << count << endl;
}
+ //prevent memory leak
+ for (int i = 0; i < lookup.size(); i++) { delete lookup[i]; }
+
//get next line to process
- if (format == "sharedfile") {
- order = input->getSharedOrderVector();
- }else {
- //you are using a list and a groupfile
- SharedList = input->getSharedListVector(); //get new list vector to process
- if (SharedList != NULL) {
- order = SharedList->getSharedOrderVector(); //gets new order vector with group info.
- }else {
- break;
- }
- }
-
+ lookup = input->getSharedRAbundVectors();
count++;
}
for(int i=0;i<rDisplays.size();i++){ delete rDisplays[i]; }
+
+ //reset groups parameter
+ globaldata->Groups.clear(); globaldata->setGroups("");
+
return 0;
}
catch(exception& e) {