Changeset 957 for trunk


Ignore:
Timestamp:
May 19, 2013 1:53:48 PM (7 years ago)
Author:
pbelotti
Message:

fixing drand48 calls for WIN_

Location:
trunk/Couenne/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/cut/sdpcuts/CouenneSdpCuts.cpp

    r956 r957  
    103103
    104104  if (fillMissingTerms_) {
    105 
    106     int nOld = problem_ -> nVars ();
    107105
    108106    for (std::vector <CouenneExprMatrix *>::iterator
  • trunk/Couenne/src/cut/sdpcuts/CutGenSparse.cpp

    r955 r957  
    2121#include "dsyevx_wrapper.hpp"
    2222
    23 #ifdef WIN32
    24 #define drand48() ((double) (rand ()) / RAND_MAX)
     23#ifdef WIN_
     24#define drand48() ((double) (rand () * (RAND_MAX + 1) + rand ()) / (RAND_MAX + 1) * (RAND_MAX + 1))
    2525#endif
    2626
     
    5353    best_idx,
    5454    rnsq     = (running_n - 1) * (running_n - 1),
    55     card_ev_best;
     55    card_ev_best = running_n - 1;
    5656
    5757  double
  • trunk/Couenne/src/main/BonCouenne.cpp

    r956 r957  
    7878
    7979int main (int argc, char *argv[]) {
     80
     81#ifdef WIN_
     82  srand ((long) time (NULL));
     83#endif
    8084
    8185  //CoinSighandler_t saveSignal = SIG_DFL;
Note: See TracChangeset for help on using the changeset viewer.