Skip to content

Commit

Permalink
Do not print warning if extra parameters are used in constraints
Browse files Browse the repository at this point in the history
  • Loading branch information
Dylan Harries committed Dec 28, 2016
1 parent 243f019 commit 535afae
Showing 1 changed file with 3 additions and 2 deletions.
5 changes: 3 additions & 2 deletions meta/Constraint.m
Original file line number Diff line number Diff line change
Expand Up @@ -235,7 +235,7 @@
CheckSetting[patt:(FlexibleSUSY`FSMinimize|FlexibleSUSY`FSFindRoot)[parameters_, value_],
constraintName_String] :=
Module[{modelParameters, unknownParameters},
modelParameters = Parameters`GetModelParameters[];
modelParameters = Join[Parameters`GetModelParameters[], Parameters`GetExtraParameters[]];
If[Head[parameters] =!= List,
Print["Error: In constraint ", constraintName, ": ", InputForm[patt]];
Print[" First parameter must be a list!"];
Expand Down Expand Up @@ -275,7 +275,8 @@

CheckSetting[patt:FlexibleSUSY`FSSolveEWSBFor[parameters_List],
constraintName_String] :=
Module[{unknownParameters = Complement[parameters, Parameters`GetModelParameters[]]},
Module[{unknownParameters = Complement[parameters, Join[Parameters`GetModelParameters[],
Parameters`GetExtraParameters[]]]},
If[unknownParameters =!= {},
Print["Error: In constraint ", constraintName, ": ", InputForm[patt],
" Unknown parameters: ", unknownParameters];
Expand Down

0 comments on commit 535afae

Please sign in to comment.