Changeset 2531


Ignore:
Timestamp:
Oct 3, 2019 9:48:16 AM (19 months ago)
Author:
stefan
Message:

merge r2503,r2504,r2506,r2509..r2512,r2527 from trunk

Location:
stable/1.17
Files:
9 edited

Legend:

Unmodified
Added
Removed
  • stable/1.17

  • stable/1.17/Clp

  • stable/1.17/Clp/src

  • stable/1.17/Clp/src/ClpSimplex.cpp

    r2453 r2531  
    63106310  ClpCholeskyTaucs *cholesky = new ClpCholeskyTaucs();
    63116311  barrier.setCholesky(cholesky);
    6312 #elifdef COIN_HAS_MUMPS
     6312#elif defined(COIN_HAS_MUMPS)
    63136313  if (!doKKT) {
    63146314    ClpCholeskyMumps *cholesky = new ClpCholeskyMumps();
     
    69336933      }
    69346934      numberWritten = fwrite(array, lengthNames_ + 1, numberColumns_, fp);
    6935       if (numberWritten != static_cast< size_t >(numberColumns_))
     6935      if (numberWritten != static_cast< size_t >(numberColumns_)) {
     6936        delete[] array;
    69366937        return 1;
    6937       delete[] array;
     6938      }
    69386939    }
    69396940#endif
  • stable/1.17/Clp/src/ClpSimplexOther.cpp

    r2388 r2531  
    70417041      }
    70427042    }
     7043
     7044    delete[] which2;
    70437045  }
    70447046  if (newStatus) {
  • stable/1.17/Clp/src/OsiClp

  • stable/1.17/Clp/src/OsiClp/OsiClpSolverInterface.cpp

    r2449 r2531  
    27882788}
    27892789
    2790 #ifdef CONFLICT_CUTS
    27912790// Return a conflict analysis cut from small model
    27922791OsiRowCut *
     
    35823581  return cut;
    35833582}
    3584 #endif
    35853583
    35863584//#############################################################################
  • stable/1.17/Clp/src/OsiClp/OsiClpSolverInterface.hpp

    r2386 r2531  
    175175  */
    176176  virtual void enableSimplexInterface(bool doingPrimal);
    177   /// Copy across enabled stuff from one solver to another
    178   void copyEnabledSuff(OsiClpSolverInterface &rhs);
    179177
    180178  /*! \brief Undo setting changes made by #enableSimplexInterface */
    181179  virtual void disableSimplexInterface();
    182   /// Copy across enabled stuff from one solver to another
    183   void copyEnabledStuff(ClpSimplex &rhs);
    184180
    185181  /** Perform a pivot by substituting a colIn for colOut in the basis.
     
    973969  virtual int loadFromCoinModel(CoinModel &modelObject, bool keepSolution = false);
    974970
    975   using OsiSolverInterface::readMps;
    976971  /** Read an mps file from the given filename (defaults to Osi reader) - returns
    977972      number of errors (see OsiMpsReader class) */
  • stable/1.17/Clp/src/unitTest.cpp

    r2385 r2531  
    7373
    7474// Function Prototypes. Function definitions is in this file.
    75 void testingMessage(const char *const msg);
     75static void testingMessage(const char *const msg);
    7676#if defined(COIN_HAS_AMD) || defined(COIN_HAS_CHOLMOD) || defined(COIN_HAS_GLPK)
    7777static int barrierAvailable = 1;
     
    13971397
    13981398// Display message on stdout and stderr
    1399 void testingMessage(const char *const msg)
     1399static void testingMessage(const char *const msg)
    14001400{
    14011401  std::cerr << msg;
Note: See TracChangeset for help on using the changeset viewer.