Ignore:
Timestamp:
Nov 5, 2009 10:57:25 AM (10 years ago)
Author:
forrest
Message:

Creating new stable branch 2.4 from trunk (rev 1270)

Location:
stable/2.4
Files:
1 edited
1 copied

Legend:

Unmodified
Added
Removed
  • stable/2.4

    • Property svn:externals
      •  

        old new  
        77CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.5/CoinUtils
        88Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.54/Cgl
        9 Clp               https://projects.coin-or.org/svn/Clp/stable/1.10/Clp
         9Clp               https://projects.coin-or.org/svn/Clp/stable/1.11/Clp
        1010Osi               https://projects.coin-or.org/svn/Osi/stable/0.100/Osi
        1111Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
  • stable/2.4/Cbc/src/CbcEventHandler.hpp

    r741 r1271  
    9090    solution,
    9191    /*! A heuristic solution has been found. */
    92     heuristicSolution
     92    heuristicSolution,
     93    /*! A solution will be found unless user takes action (first check). */
     94    beforeSolution1,
     95    /*! A solution will be found unless user takes action (thorough check). */
     96    beforeSolution2,
     97    /*! End of search. */
     98    endSearch
    9399  } ;
    94100
     
    108114    restart,
    109115    /*! RestartRoot --- undo root node and start branch-and-cut afresh. */
    110     restartRoot
     116    restartRoot,
     117    /*! Add special cuts. */
     118    addCuts,
     119    /*! Pretend solution never happened. */
     120    killSolution
     121     
    111122  } ;
    112123
     
    135146  /*! \brief Default constructor. */
    136147
    137   CbcEventHandler(const CbcModel *model = NULL) ;
     148  CbcEventHandler(CbcModel *model = NULL) ;
    138149
    139150  /*! \brief Copy constructor. */
     
    193204  /*! \brief Pointer to associated CbcModel */
    194205
    195   const CbcModel *model_ ;
     206  CbcModel *model_ ;
    196207
    197208  /*! \brief Default action */
Note: See TracChangeset for help on using the changeset viewer.