X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=globaldata.cpp;h=015293d727e5e94c51f1ce2bbe5a7ff6c6a7aee9;hb=3c5c4e255ee8c36feb9e97aebc4e792e6ff8c440;hp=66a44f25b7246af237194e634eeeeb9514623899;hpb=0190105145fbd3e02da8f23cb50841229e5d696f;p=mothur.git diff --git a/globaldata.cpp b/globaldata.cpp index 66a44f2..015293d 100644 --- a/globaldata.cpp +++ b/globaldata.cpp @@ -110,7 +110,6 @@ void GlobalData::parseGlobalData(string commandString, string optionText){ if (key == "fileroot" ) { fileroot = value; } if (key == "abund" ) { abund = value; } if (key == "random" ) { randomtree = value; } - if (key == "groups" ) { groups = value; } if (key == "calc") { calc = value; } @@ -160,7 +159,6 @@ void GlobalData::parseGlobalData(string commandString, string optionText){ if (key == "fileroot" ) { fileroot = value; } if (key == "abund" ) { abund = value; } if (key == "random" ) { randomtree = value; } - if (key == "groups" ) { groups = value; } if (key == "calc") { calc = value; } @@ -261,6 +259,7 @@ string GlobalData::getJumble() { return jumble; } string GlobalData::getFreq() { return freq; } string GlobalData::getAbund() { return abund; } string GlobalData::getRandomTree() { return randomtree; } +string GlobalData::getGroups() { return groups; } void GlobalData::setListFile(string file) { listfile = file; inputFileName = file;} void GlobalData::setRabundFile(string file) { rabundfile = file; inputFileName = file;} void GlobalData::setSabundFile(string file) { sabundfile = file; inputFileName = file;} @@ -269,7 +268,8 @@ void GlobalData::setColumnFile(string file) { columnfile = file; inputFileNam void GlobalData::setNameFile(string file) { namefile = file; } void GlobalData::setFormat(string Format) { format = Format; } void GlobalData::setRandomTree(string Random) { randomtree = Random; } -void GlobalData::setCalc(string Calc) { calc = Calc; } +void GlobalData::setGroups(string g) { groups = g; } +void GlobalData::setCalc(string Calc) { calc = Calc; } /*******************************************************/