tweaked tests to support dashes in arg names

This commit is contained in:
mes5k 2008-05-06 06:02:02 +00:00
parent e8a8b330e3
commit cad795c4b8
3 changed files with 5 additions and 5 deletions

View File

@ -40,14 +40,14 @@ int main(int argc, char **argv)
false, -10, "negative int"); false, -10, "negative int");
cmd.add( gapCreate ); cmd.add( gapCreate );
ValueArg<int> gapExtend("g","gapExtend", ValueArg<int> gapExtend("g","gap-Extend",
"The cost for each extension of a gap", false, -2, "negative int"); "The cost for each extension of a gap", false, -2, "negative int");
cmd.add( gapExtend ); cmd.add( gapExtend );
SwitchArg dna("d","isDna","The input sequences are DNA", false); SwitchArg dna("d","isDna","The input sequences are DNA", false);
cmd.add( dna ); cmd.add( dna );
ValueArg<string> scoringMatrixName("s","scoringMatrix", ValueArg<string> scoringMatrixName("s","scoring--Matrix",
"Scoring Matrix name", false,"BLOSUM50","name string"); "Scoring Matrix name", false,"BLOSUM50","name string");
cmd.add( scoringMatrixName ); cmd.add( scoringMatrixName );

View File

@ -453,7 +453,7 @@ inline Arg::Arg(const std::string& flag,
if ( ( _name.substr( 0, Arg::flagStartString().length() ) == Arg::flagStartString() ) || if ( ( _name.substr( 0, Arg::flagStartString().length() ) == Arg::flagStartString() ) ||
( _name.substr( 0, Arg::nameStartString().length() ) == Arg::nameStartString() ) || ( _name.substr( 0, Arg::nameStartString().length() ) == Arg::nameStartString() ) ||
( _name.find( " ", 0 ) != std::string::npos ) ) ( _name.find( " ", 0 ) != std::string::npos ) )
throw(SpecificationException("Argument name cannot contain either '" + throw(SpecificationException("Argument name begin with either '" +
Arg::flagStartString() + "' or '" + Arg::flagStartString() + "' or '" +
Arg::nameStartString() + "' or space.", Arg::nameStartString() + "' or space.",
toString() ) ); toString() ) );

View File

@ -29,13 +29,13 @@ Where:
-x <filename>, --filename1 <filename> -x <filename>, --filename1 <filename>
Sequence 1 filename (FASTA format) Sequence 1 filename (FASTA format)
-s <name string>, --scoringMatrix <name string> -s <name string>, --scoring--Matrix <name string>
Scoring Matrix name Scoring Matrix name
-d, --isDna -d, --isDna
The input sequences are DNA The input sequences are DNA
-g <negative int>, --gapExtend <negative int> -g <negative int>, --gap-Extend <negative int>
The cost for each extension of a gap The cost for each extension of a gap
-f <negative int>, --gapCreate <negative int> -f <negative int>, --gapCreate <negative int>