Commit 0e70dfa7 authored by snuverink_j's avatar snuverink_j
Browse files

fix opal parser test reflecting the changes of 2e036514

parent 4d1ccd68
......@@ -24,17 +24,17 @@ else {
FINSS_RGUN_dphi = 2.3603907853129149/180.0*PI;
}
//obj1: OBJECTIVE, EXPR="KS*KS";
//o2: OBJECTIVE, EXPR="sumErrSq("resources/measurement_test.dat", "rms_x", "statfile")";
//ob3: OBJECTIVE, EXPR="fromFile("resources/from_file.dat", "var")";
//d1: DVAR, VARIABLE="KS", LOWERBOUND="0.0", UPPERBOUND="0.5";
//c1: CONSTRAINT, EXPR="KS < 1.0";
obj1: OBJECTIVE, EXPR="KS*KS";
o2: OBJECTIVE, EXPR="sumErrSq("resources/measurement_test.dat", "rms_x", "statfile")";
ob3: OBJECTIVE, EXPR="fromFile("resources/from_file.dat", "var")";
d1: DVAR, VARIABLE="KS", LOWERBOUND="0.0", UPPERBOUND="0.5";
c1: CONSTRAINT, EXPR="KS < 1.0";
//objs: OBJECTIVES = (obj1, o2, ob3);
//dvars: DVARS = (d1);
//constrs: CONSTRAINTS = (c1);
objs: OBJECTIVES = (obj1, o2, ob3);
dvars: DVARS = (d1);
constrs: CONSTRAINTS = (c1);
//opt: OPTIMIZE, OBJECTIVES=objs, DVARS=dvars, CONSTRAINTS=constrs;
opt: OPTIMIZE, OBJECTIVES=objs, DVARS=dvars, CONSTRAINTS=constrs;
// -----------------------------------------------------------------------------------------
// RF-COMPONENTS
......
......@@ -13,8 +13,7 @@
* \brief Implements a parser for OPAL input files
*
* This class extracts the optimization problem (objectives, constraints,
* design variables) from an Opal input file. All statements are prefixed
* with "//", e.g.,
* design variables) from an Opal input file. E.g.,
*
* \verbatim
d1: DVAR, ELEMENT="", VARIABLE="SIGX";
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment