Changeset 959 for trunk


Ignore:
Timestamp:
May 24, 2013 12:43:23 AM (7 years ago)
Author:
stefan
Message:

explicitly call SCIPlpiSwitchSetDefaultSolver in main

Location:
trunk/Couenne/src/main
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/main/BonCouenne.cpp

    r957 r959  
    1111// Date : 12/19/2006
    1212
    13 #if defined(_MSC_VER)
    14 // Turn off compiler warning about long names
    15 #  pragma warning(disable:4786)
    16 #endif
    17 
    1813#include <iomanip>
    1914#include <fstream>
     
    2116#include <stdlib.h>
    2217
     18#include "CoinPragma.hpp"
    2319#include "CoinTime.hpp"
    2420#include "CoinError.hpp"
     
    5652#endif
    5753
     54#ifdef COIN_HAS_SCIP
     55#include "lpiswitch.h"
     56#endif
     57
    5858#include "CoinSignal.hpp"
    5959
     
    8080
    8181#ifdef WIN_
     82  // FIXME really want Couenne runs to be nondeterministic?
    8283  srand ((long) time (NULL));
    8384#endif
     
    9394  WindowsErrorPopupBlocker();
    9495  using namespace Ipopt;
     96
     97#ifdef COIN_HAS_SCIP
     98  SCIPlpiSwitchSetDefaultSolver();
     99#endif
    95100
    96101  char * pbName = NULL;
  • trunk/Couenne/src/main/Couenne.cpp

    r530 r959  
    3838#include "CouenneProblem.hpp"
    3939
     40#ifdef COIN_HAS_SCIP
     41#include "lpiswitch.h"
     42#endif
     43
    4044
    4145namespace Ipopt {
     
    7882int main (int argc, char *argv[]) {
    7983  WindowsErrorPopupBlocker();
     84
     85#ifdef COIN_HAS_SCIP
     86  SCIPlpiSwitchSetDefaultSolver();
     87#endif
    8088
    8189  double time_start = CoinCpuTime();
Note: See TracChangeset for help on using the changeset viewer.