Changeset 78


Ignore:
Timestamp:
Mar 17, 2009 10:40:27 AM (11 years ago)
Author:
pbelotti
Message:

increase nOrigVars_ in CouenneProblem::addVariables (cleaner)

Location:
trunk/Couenne/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/problem/CouenneProblem.cpp

    r75 r78  
    372372    nIntVars_++;
    373373
     374  nOrigVars_++;
     375
    374376  return var;
    375377}
  • trunk/Couenne/src/problem/problem.cpp

    r61 r78  
    134134  // decomposed previously, since they are updated with increasing
    135135  // index.
     136
    136137  for (int j=0, i=nVars (); i--; j++) {
    137138
     
    151152
    152153      if (var -> Type () == AUX)
    153         //x [index] = //not necessary, addresses of x and X are equal
    154         X (index) =
    155           CoinMax (l, CoinMin (u, (*(var -> Image ())) ()));
     154        X (index) =  // addresses of x[] and X() are equal
     155          CoinMax (l, CoinMin (u, (*(var -> Image ())) ()));
     156
    156157    } else X (index) = 0.;
    157158  }
  • trunk/Couenne/src/readnl/readnl.cpp

    r40 r78  
    7474  for (int i = ndefined_; i--;)                                  addVariable(false, &domain_);
    7575
    76   nOrigVars_ = n_var;
    77 
    7876  // common expressions (or defined variables) ///////////////////////////////////////
    7977
Note: See TracChangeset for help on using the changeset viewer.