59 |
|
#define G_MINIMIZER 38 |
60 |
|
#define G_MIN_MAXITER 39 |
61 |
|
#define G_MIN_WRITEFRQ 40 |
62 |
< |
#define G_MIN_RESETFRQ 41 |
62 |
> |
#define G_MIN_STEPSIZE 41 |
63 |
|
#define G_MIN_FTOL 42 |
64 |
|
#define G_MIN_GTOL 43 |
65 |
|
#define G_MIN_LSTOL 44 |
120 |
|
addHash( "minimizer", G_MINIMIZER); |
121 |
|
addHash( "minMaxIter", G_MIN_MAXITER); |
122 |
|
addHash( "minWriteFrq", G_MIN_WRITEFRQ); |
123 |
< |
addHash( "minResetFrq", G_MIN_RESETFRQ); |
123 |
> |
addHash( "minStepSize", G_MIN_STEPSIZE); |
124 |
|
addHash( "minFTol", G_MIN_FTOL); |
125 |
|
addHash( "minGTol", G_MIN_GTOL); |
126 |
|
addHash( "minLSTol", G_MIN_LSTOL); |
1325 |
|
} |
1326 |
|
break; |
1327 |
|
|
1328 |
< |
case G_MIN_RESETFRQ: |
1328 |
> |
case G_MIN_STEPSIZE: |
1329 |
|
switch( the_type ){ |
1330 |
|
|
1331 |
|
case STRING: |
1335 |
|
break; |
1336 |
|
|
1337 |
|
case DOUBLE: |
1338 |
< |
minimizer_resetfrq= the_event->evt.asmt.rhs.dval; |
1339 |
< |
have_minimizer_resetfrq = 1; |
1338 |
> |
minimizer_stepsize= the_event->evt.asmt.rhs.dval; |
1339 |
> |
have_minimizer_stepsize = 1; |
1340 |
|
return 1; |
1341 |
|
break; |
1342 |
|
|
1343 |
|
case INT: |
1344 |
< |
minimizer_resetfrq= the_event->evt.asmt.rhs.ival; |
1345 |
< |
have_minimizer_resetfrq = 1; |
1344 |
> |
minimizer_stepsize= the_event->evt.asmt.rhs.ival; |
1345 |
> |
have_minimizer_stepsize = 1; |
1346 |
|
return 1; |
1347 |
|
break; |
1348 |
|
|