Ignore:
Timestamp:
Jul 25, 2009 4:39:55 AM (10 years ago)
Author:
forrest
Message:

get rid of compiler warnings

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/CbcOrClpParam.hpp

    r1401 r1402  
    7676    PRIMALPIVOT,PRESOLVE,CRASH,BIASLU,PERTURBATION,MESSAGES,AUTOSCALE,
    7777    CHOLESKY,KKT,BARRIERSCALE,GAMMA,CROSSOVER,PFI,INTPRINT,VECTOR,
    78     FACTORIZATION,
     78    FACTORIZATION,ALLCOMMANDS,
    7979   
    8080    NODESTRATEGY = 251,BRANCHSTRATEGY,CUTSSTRATEGY,HEURISTICSTRATEGY,
     
    109109  CbcOrClpParam (  );
    110110  CbcOrClpParam (std::string name, std::string help,
    111            double lower, double upper, CbcOrClpParameterType type,bool display=true);
     111           double lower, double upper, CbcOrClpParameterType type,int display=2);
    112112  CbcOrClpParam (std::string name, std::string help,
    113            int lower, int upper, CbcOrClpParameterType type,bool display=true);
     113           int lower, int upper, CbcOrClpParameterType type,int display=2);
    114114  // Other strings will be added by insert
    115115  CbcOrClpParam (std::string name, std::string help, std::string firstValue,
    116            CbcOrClpParameterType type,int whereUsed=7,bool display=true);
     116           CbcOrClpParameterType type,int whereUsed=7,int display=2);
    117117  // Action
    118118  CbcOrClpParam (std::string name, std::string help,
    119            CbcOrClpParameterType type,int whereUsed=7,bool display=true);
     119           CbcOrClpParameterType type,int whereUsed=7,int display=2);
    120120  /// Copy constructor.
    121121  CbcOrClpParam(const CbcOrClpParam &);
     
    180180  /// Returns name which could match
    181181  std::string matchName (  ) const;
     182  /// Returns length of name for ptinting
     183  int lengthMatchName (  ) const;
    182184  /// Returns parameter option which matches (-1 if none)
    183185  int parameterOption ( std::string check ) const;
     
    214216  { return type_;}
    215217  /// whether to display
    216   inline bool displayThis() const
     218  inline int displayThis() const
    217219  { return display_;}
    218220  /// Set Long help
     
    267269  int currentKeyWord_;
    268270  /// Display on ?
    269   bool display_;
     271  int display_;
    270272  /// Integer parameter - current value
    271273  int intValue_;
Note: See TracChangeset for help on using the changeset viewer.