Revision 1509 trunk/src/nh99/lbfgs.cpp

lbfgs.cpp (revision 1509)
1411 1411
/*        IF AN UNUSUAL TERMINATION IS TO OCCUR THEN LET */
1412 1412
/*        STP BE THE LOWEST POINT OBTAINED SO FAR. */
1413 1413

  
1414
    if (brackt && (*stp <= stmin || *stp >= stmax) || *nfev >= *maxfev - 1 ||
1415
            infoc == 0 || brackt && stmax - stmin <= *xtol * stmax) {
1414
    if ( ( brackt && (*stp <= stmin || *stp >= stmax) ) || *nfev >= *maxfev - 1 ||
1415
            infoc == 0 || (brackt && stmax - stmin <= *xtol * stmax) ) {
1416 1416
        *stp = stx;
1417 1417
    }
1418 1418

  
......
1441 1441

  
1442 1442
/*        TEST FOR CONVERGENCE. */
1443 1443

  
1444
    if ( brackt && (*stp <= stmin || *stp >= stmax) || infoc == 0) {
1444
    if ( (brackt && (*stp <= stmin || *stp >= stmax)) || infoc == 0) {
1445 1445
        *info = 6;
1446 1446
    }
1447 1447
    if (*stp == lb3_1.stpmax && *f <= ftest1 && dg <= dgtest) {

Also available in: Unified diff