Changeset 199 for stable/BSP


Ignore:
Timestamp:
Jul 6, 2009 9:47:29 PM (13 years ago)
Author:
ladanyi
Message:

cosmetic change + change to get rid of compiler error

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/BSP/Couenne/src/expression/exprAux.cpp

    r159 r199  
    277277                                     JnlstPtr jnlst) {
    278278
    279   CouenneObject *retp = NULL;
    280 
    281   /*if (image_ -> code () == COU_EXPRMUL) printf ("OK1\n");
     279  /*
     280  if (image_ -> code () == COU_EXPRMUL) printf ("OK1\n");
    282281  if (image_ -> ArgList () [0] -> Index () >= 0) printf ("OK2\n");
    283282  if (image_ -> ArgList () [1] -> Index () >= 0) printf ("OK3\n");
    284283  if (fabs (lb ()) < COUENNE_EPS) printf ("OK4\n");
    285   if (fabs (ub ()) < COUENNE_EPS) printf ("OK5\n");*/
     284  if (fabs (ub ()) < COUENNE_EPS) printf ("OK5\n");
     285  */
    286286
    287287  // todo: this is an expression method
     
    295295    // it's a complementarity constraint object!
    296296
    297     CouenneComplObject obj (p, this, base, jnlst);
    298     return obj;
    299   }
    300   else {
    301     CouenneObject obj (p, this, base, jnlst);
    302     return obj;
    303   }
    304 
    305   //  return (*retp);
    306 }
     297    return CouenneComplObject(p, this, base, jnlst);
     298  }
     299
     300  // Otherwise just return a plain CouenneObject
     301  return CouenneObject(p, this, base, jnlst);
     302}
Note: See TracChangeset for help on using the changeset viewer.