Changeset 1083 for trunk


Ignore:
Timestamp:
Nov 20, 2014 12:29:43 PM (5 years ago)
Author:
pbelotti
Message:

cosmetic changes

Location:
trunk/Couenne/src/problem
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/Couenne/src/problem/CouenneProblem.hpp

    r1033 r1083  
    839839                   const double precision, double &maxViol) const;
    840840
    841   /// returns true iff value of all auxilliaries are within bounds
     841  /// returns true iff value of all auxiliaries are within bounds
    842842  bool checkAux(const CouNumber *sol,
    843843                const bool stopAtFirstViol,
    844844                const double precision, double &maxViol) const;
    845845
    846   /// returns true iff value of all auxilliaries are within bounds
     846  /// returns true iff value of all auxiliaries are within bounds
    847847  bool checkCons(const CouNumber *sol,
    848848                 const bool stopAtFirstViol,
  • trunk/Couenne/src/problem/CouenneRecordBestSol.cpp

    r943 r1083  
    197197/*****************************************************************************/
    198198void CouenneRecordBestSol::setSol(const double *givenSol, const int givenCard,
    199                            const double givenMaxViol) {
     199                                  const double givenMaxViol) {
    200200  if(sol == NULL) {
    201201    cardSol = givenCard;
  • trunk/Couenne/src/problem/CouenneRecordBestSol.hpp

    r643 r1083  
    1515
    1616namespace Couenne {
    17 
    18 class CouenneProblem;
    1917
    2018// class to record best found feasible solution
     
    103101                     const double precision);
    104102
    105   inline int getCardModSol() const {return cardModSol;};
     103  inline int getCardModSol() const {return cardModSol;}
    106104  double *getModSol(const int expectedCard);
    107   inline double getModSolVal() const {return modSolVal;};
    108   inline double getModSolMaxViol() const {return modSolMaxViol;};
     105  inline double getModSolVal() const {return modSolVal;}
     106  inline double getModSolMaxViol() const {return modSolMaxViol;}
    109107
    110108  // set modSol, modSolVal, and modSolMaxViol to given values; if
Note: See TracChangeset for help on using the changeset viewer.