X-Git-Url: https://git.donarmstrong.com/?p=mothur.git;a=blobdiff_plain;f=newcommandtemplate.cpp;h=b9dc986a7fa10f933cff0add5092e76a4ce62e5c;hp=b2426f5c1bf0cf38306bea7bf756c01743a21f5a;hb=1a20e24ee786195ab0e1cccd4f5aede7a88f3f4e;hpb=1a5c2356c1b955c6ec024b2baf9f46377ee7c72e diff --git a/newcommandtemplate.cpp b/newcommandtemplate.cpp index b2426f5..b9dc986 100644 --- a/newcommandtemplate.cpp +++ b/newcommandtemplate.cpp @@ -6,7 +6,7 @@ // Copyright (c) 2012 Schloss Lab. All rights reserved. // - +// #include "newcommandtemplate.h" //********************************************************************************************************************** @@ -183,7 +183,7 @@ NewCommand::NewCommand(string option) { ///variables for examples below that you will most likely want to put in the header for //use by the other class functions. - string phylipfile, columnfile, namefile, fastafile, sharedfile, method; + string phylipfile, columnfile, namefile, fastafile, sharedfile, method, countfile; int processors; bool useTiming, allLines; vector Estimators, Groups; @@ -304,10 +304,13 @@ NewCommand::NewCommand(string option) { //saved by mothur that is associated with the other files you are using as inputs. //You can do so by adding the files associated with the namefile to the files vector and then asking parser to check. //This saves our users headaches over file mismatches because they forgot to include the namefile, :) - if (namefile == "") { - vector files; files.push_back(fastafile); - parser.getNameFile(files); - } + if (countfile == "") { + if (namefile == "") { + vector files; files.push_back(fastafile); + parser.getNameFile(files); + } + } + }