Changeset 2274 for trunk


Ignore:
Timestamp:
Sep 29, 2017 7:21:34 AM (8 months ago)
Author:
forrest
Message:

changes for CoinBigIndex?

Location:
trunk/Clp/src
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • trunk/Clp/src/ClpFactorization.cpp

    r2271 r2274  
    12151215     model_=rhs.model_;
    12161216#endif
     1217#if COIN_BIG_INDEX==0
    12171218     if (denseIfSmaller > 0 && denseIfSmaller <= goDenseThreshold_) {
    12181219          CoinDenseFactorization * denseR =
     
    12361237               goDense = 3;
    12371238     }
     1239#endif
    12381240     if (rhs.coinFactorizationA_ && !goDense)
    12391241          coinFactorizationA_ = new CoinFactorization(*(rhs.coinFactorizationA_));
     
    12441246     else
    12451247          coinFactorizationB_ = NULL;
     1248#if COIN_BIG_INDEX==0
    12461249     if (goDense) {
    12471250          delete coinFactorizationB_;
    12481251          if (goDense == 1)
    12491252               coinFactorizationB_ = new CoinDenseFactorization();
    1250 #if COIN_BIG_INDEX==0
    12511253          else if (goDense == 2)
    12521254               coinFactorizationB_ = new CoinSimpFactorization();
    12531255          else
    12541256               coinFactorizationB_ = new CoinOslFactorization();
    1255 #endif
    12561257          if (rhs.coinFactorizationA_) {
    12571258               coinFactorizationB_->maximumPivots(rhs.coinFactorizationA_->maximumPivots());
     
    12651266          }
    12661267     }
     1268#endif
    12671269     assert (!coinFactorizationA_ || !coinFactorizationB_);
    12681270#ifdef CLP_FACTORIZATION_INSTRUMENT
  • trunk/Clp/src/ClpMessage.cpp

    r2235 r2274  
    3434     {CLP_DUAL_CHECKB, 12, 2, "New dual bound of %g"},
    3535     {CLP_DUAL_ORIGINAL, 13, 3, "Going back to original objective"},
    36      {CLP_SIMPLEX_PERTURB, 14, 1, "Perturbing problem by %g%%of %g - largest nonzero change %g ( %g%%) - largest zero change %g"},
     36     {CLP_SIMPLEX_PERTURB, 14, 1, "Perturbing problem by %g%% of %g - largest nonzero change %g ( %g%%) - largest zero change %g"},
    3737     {CLP_PRIMAL_ORIGINAL, 15, 2, "Going back to original tolerance"},
    3838     {CLP_PRIMAL_WEIGHT, 16, 2, "New infeasibility weight of %g"},
  • trunk/Clp/src/ClpModel.cpp

    r2271 r2274  
    41924192     return coinModel;
    41934193}
     4194#else
     4195CoinModel *
     4196ClpModel::createCoinModel() const
     4197{
     4198  fprintf(stderr,"createCoinModel not available with COIN_BIG_INDEX\n");
     4199  abort();
     4200  return NULL;
     4201}
    41944202#endif
    41954203// Start or reset using maximumRows_ and Columns_
  • trunk/Clp/src/ClpSimplex.cpp

    r2271 r2274  
    55775577#endif
    55785578     int returnCode = static_cast<ClpSimplexDual *> (this)->dual(ifValuesPass, startFinishOptions);
     5579     eventHandler_->event(ClpEventHandler::looksEndInDual);
    55795580#ifdef EXPENSIVE
    55805581     if (problemStatus_ == 1) {
     
    59975998     */
    59985999     int returnCode = static_cast<ClpSimplexPrimal *> (this)->primal(ifValuesPass, startFinishOptions);
     6000     eventHandler_->event(ClpEventHandler::looksEndInPrimal);
    59996001     //int lastAlgorithm=1;
    60006002     if (problemStatus_ == 10) {
     
    75597561     optimizationDirection_ = modelObject.optimizationDirection();
    75607562     return returnCode;
     7563}
     7564#else
     7565int
     7566ClpSimplex::loadProblem (  CoinModel & modelObject, bool /*keepSolution*/)
     7567{
     7568  fprintf(stderr,"loadProblem from CoinModel not available with COIN_BIG_INDEX\n");
     7569  abort();
     7570  return 0;
    75617571}
    75627572#endif
Note: See TracChangeset for help on using the changeset viewer.