Merge branch 'develop' into feature/heterogeneousSmartFactorNoise

release/4.3a0
Luca 2016-08-16 18:54:18 -04:00
commit 2a6d372b0a
1 changed files with 2 additions and 2 deletions

View File

@ -85,8 +85,8 @@ struct QPSParser::MPSGrammar: base_grammar {
>> +blank >> double_)[colDouble] >> *blank]; >> +blank >> double_)[colDouble] >> *blank];
quad_l = lexeme[*blank >> word >> +blank >> word >> +blank >> double_ quad_l = lexeme[*blank >> word >> +blank >> word >> +blank >> double_
>> *blank][addQuadTerm]; >> *blank][addQuadTerm];
bound = lexeme[*blank >> word >> +blank >> word >> +blank >> word >> +blank bound = lexeme[(*blank >> word >> +blank >> word >> +blank >> word >> +blank
>> double_ >> *blank][addBound]; >> double_)[addBound] >> *blank];
bound_fr = lexeme[*blank >> word >> +blank >> word >> +blank >> word bound_fr = lexeme[*blank >> word >> +blank >> word >> +blank >> word
>> *blank][addBoundFr]; >> *blank][addBoundFr];
rows = lexeme[lit("ROWS") >> *blank >> eol >> +(row >> eol)]; rows = lexeme[lit("ROWS") >> *blank >> eol >> +(row >> eol)];