Changeset 1005


Ignore:
Timestamp:
Dec 18, 2007 3:01:27 PM (12 years ago)
Author:
pbelotti
Message:

more output fixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/Couenne/Couenne/src/branch/infeasibility.cpp

    r1004 r1005  
    4949  if ((delta                           < COUENNE_EPS) ||
    5050      (delta / (1 + fabs (var + expr)) < COUENNE_EPS))
    51 #if BR_TEST_LOG >= 0 || defined DEBUG
    5251    {
     52#if BR_TEST_LOG >= 0 && defined DEBUG
    5353      if (reference_ -> Image () -> code () == COU_EXPRLOG) {
    5454        printf ("---- found feasible point on curve: ");
     
    5757        printf ("\n");
    5858      }
    59       return 0.;
    60     }
    61 #else
    62  {
     59#elif defined DEBUG
    6360   printf ("----|%+g - %+g| = %+g  (delta=%+g) way %d, ind %d. ",  ////[%.2f,%.2f]
    6461           var, expr,
     
    6966   reference_ -> Image () -> print (std::cout); printf ("\n");
    7067   return 0.;
    71  }
    7268#endif
     69      return 0.;
     70    }
    7371
    7472  // a nonlinear constraint w = f(x) is violated. The infeasibility
Note: See TracChangeset for help on using the changeset viewer.