Ignore:
Timestamp:
Aug 21, 2009 12:19:13 PM (10 years ago)
Author:
forrest
Message:

fixes

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcModel.hpp

    r1211 r1212  
    199199     void branchAndBound(int doStatistics=0);
    200200private:
     201
    201202    /** \brief Evaluate a subproblem using cutting planes and heuristics
    202203
     
    562563  /// Current time since start of branchAndbound
    563564  double getCurrentSeconds() const ;
     565
     566  /// Return true if maximum time reached
     567  bool maximumSecondsReached() const ;
    564568
    565569  /** Set the
     
    11581162  inline void setSolutionCount(int value)
    11591163  { numberSolutions_=value;}
     1164  /// Number of saved solutions (including best)
     1165  int numberSavedSolutions() const;
     1166  /// Maximum number of extra saved solutions
     1167  inline int maximumSavedSolutions() const
     1168  { return maximumSavedSolutions_;}
     1169  /// Set maximum number of extra saved solutions
     1170  void setMaximumSavedSolutions(int value);
     1171  /// Return a saved solution (0==best) - NULL if off end
     1172  const double * savedSolution(int which) const;
     1173  /// Return a saved solution objective (0==best) - COIN_DBL_MAX if off end
     1174  double savedSolutionObjective(int which) const;
     1175
    11601176  /** Current phase (so heuristics etc etc can find out).
    11611177      0 - initial solve
     
    16911707  */
    16921708  void synchronizeHandlers(int makeDefault);
    1693      
     1709  /// Save a solution to saved list
     1710  void saveExtraSolution(const double * solution, double objectiveValue);
     1711  /// Save a solution to best and move current to saved
     1712  void saveBestSolution(const double * solution, double objectiveValue);
     1713  /// Delete best and saved solutions
     1714  void deleteSolutions();
    16941715  /// Encapsulates solver resolve
    16951716  int resolve(OsiSolverInterface * solver);
     
    19511972  /// Array holding the incumbent (best) solution.
    19521973  double * bestSolution_;
     1974  /// Arrays holding other solutions.
     1975  double ** savedSolutions_;
    19531976
    19541977  /** Array holding the current solution.
     
    19751998  /// Number of solutions
    19761999  int numberSolutions_;
     2000  /// Number of saved solutions
     2001  int numberSavedSolutions_;
     2002  /// Maximum number of saved solutions
     2003  int maximumSavedSolutions_;
    19772004  /** State of search
    19782005      0 - no solution
Note: See TracChangeset for help on using the changeset viewer.