Ignore:
Timestamp:
Feb 7, 2019 2:50:37 PM (8 months ago)
Author:
unxusr
Message:

simplify handling of parameters and remove staticParameterData which made CbcMain0 and CbcMain1 not thread safe

File:
1 edited

Legend:

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

    r2465 r2479  
    234234  double startTime_;
    235235  /// Parameters and values
    236   CbcOrClpParam *parameters_;
    237   /// Number of parameters
    238   int numberParameters_;
     236  std::vector< CbcOrClpParam > parameters_;
    239237  /// Whether to do miplib test
    240238  bool doMiplib_;
     
    294292  double totalTime_;
    295293  // Parameters
    296   CbcOrClpParam parameters_[CBCMAXPARAMETERS];
     294  std::vector<CbcOrClpParam> parameters_;
    297295  // Printing
    298296  bool noPrinting_;
    299297  // Whether to use signal handler
    300298  bool useSignalHandler_;
    301   // Number of Parameters
    302   int numberParameters_;
    303299  // Default pump tuning
    304300  int initialPumpTune_;
Note: See TracChangeset for help on using the changeset viewer.