Ignore:
Timestamp:
Dec 10, 2009 9:30:45 PM (10 years ago)
Author:
bjarni
Message:

Moving global variables CbcOrClpRead_mode, CbcOrClpReadCommand?, CbcOrClpEnvironmentIndex?, and noPrinting below static routines analyze(), expandKnapsack(), and checkSOS(), and add noPrinting as an argument to analyze()

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/sandbox/Cbc/src/CbcSolver.cpp

    r1393 r1394  
    803803*/
    804804
    805 int CbcOrClpRead_mode = 1;
    806 FILE * CbcOrClpReadCommand = stdin;
    807 extern int CbcOrClpEnvironmentIndex;
    808 static bool noPrinting = false;
    809 
    810805#ifndef CBC_OTHER_SOLVER
    811806/*
     
    819814static int * analyze(OsiClpSolverInterface * solverMod, int & numberChanged,
    820815                     double & increment, bool changeInt,
    821                      CoinMessageHandler * generalMessageHandler)
     816                     CoinMessageHandler * generalMessageHandler, bool noPrinting)
    822817{
    823818    bool noPrinting_ = noPrinting;
     
    11201115}
    11211116#endif  // ifndef CBC_OTHER_SOLVER
     1117
     1118
    11221119
    11231120#ifdef COIN_HAS_LINK
     
    16251622#endif  //COIN_HAS_LINK
    16261623
     1624
     1625
    16271626/*
    16281627  Debug checks on special ordered sets.
     
    17351734    return 0;
    17361735}
     1736
     1737
     1738int CbcOrClpRead_mode = 1;
     1739FILE * CbcOrClpReadCommand = stdin;
     1740extern int CbcOrClpEnvironmentIndex;
     1741static bool noPrinting = false;
     1742
     1743
     1744
    17371745/*
    17381746  Wrappers for CbcMain0, CbcMain1. The various forms of callCbc will eventually
     
    49684976                            int * changed = NULL;
    49694977                            if (!miplib && increment == normalIncrement)
    4970                                 changed = analyze( osiclp, numberChanged, increment, false, generalMessageHandler);
     4978                                changed = analyze( osiclp, numberChanged, increment, false, generalMessageHandler, noPrinting);
    49714979#elif CBC_OTHER_SOLVER==1
    49724980                            double increment = babModel_->getCutoffIncrement();;
Note: See TracChangeset for help on using the changeset viewer.