Changeset 1401 for branches


Ignore:
Timestamp:
Dec 11, 2009 10:47:34 AM (9 years ago)
Author:
lou
Message:

A final commit to make it clear that CbcSolver? is an unused class in the
current code. See comments in CbcSolver?.hpp.

Location:
branches/sandbox/Cbc/src
Files:
2 edited

Legend:

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

    r1387 r1401  
    3232#include "CoinWarmStartBasis.hpp"
    3333#include "OsiSolverInterface.hpp"
    34 #include "CbcSolver.hpp"
    3534#include "Cbc_ampl.h"
    3635#include "CoinTime.hpp"
  • branches/sandbox/Cbc/src/CbcSolver.hpp

    r1383 r1401  
    44
    55/*! \file CbcSolver.hpp
    6     \brief Defines CbcSolver, the top-level class for the new-style cbc solver.
     6    \brief Defines CbcSolver, the proposed top-level class for the new-style
     7    cbc solver.
     8
     9    This class is currently an orphan. With the removal of all code flagged
     10    with the NEWS_STYLE_SOLVER, this class is never instantiated (and cannot
     11    be instantiated). It is available to be coopted as a top-level object
     12    wrapping the current CbcMain0 and CbcMain1, should that appear to be a
     13    desireable path forward.  -- lh, 091211 --
    714*/
    815
    916#ifndef CbcSolver_H
    1017#define CbcSolver_H
     18
    1119#include <string>
    1220#include <vector>
     
    1422#include "CoinMessageHandler.hpp"
    1523#include "OsiClpSolverInterface.hpp"
     24
    1625#if CBC_OTHER_SOLVER==1
    1726#include "OsiCpxSolverInterface.hpp"
    18 //typedef OsiCpxSolverInterface OsiClpSolverInterface;
    1927#endif
     28
    2029#include "CbcModel.hpp"
    2130#include "CbcOrClpParam.hpp"
     31
    2232class CbcUser;
    2333class CbcStopNow;
Note: See TracChangeset for help on using the changeset viewer.