Changeset 1304


Ignore:
Timestamp:
Nov 13, 2009 4:58:18 PM (10 years ago)
Author:
lou
Message:

Merge Cbc/trunk r1262:1270 to sync with stable/2.4 (created at r1270).

Location:
branches/reengAnn
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • branches/reengAnn

    • Property svn:externals
      •  

        old new  
        1 BuildTools    https://projects.coin-or.org/svn/BuildTools/trunk
        2 ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
        3 ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
         1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.5
         2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
         3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
        44ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
        5 ThirdParty/Glpk https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
        6 Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
        7 CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
        8 Cgl           https://projects.coin-or.org/svn/Cgl/trunk/Cgl
        9 Clp           https://projects.coin-or.org/svn/Clp/trunk/Clp
        10 Osi           https://projects.coin-or.org/svn/Osi/trunk/Osi
        11 Vol           https://projects.coin-or.org/svn/Vol/trunk/Vol
         5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
         6Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
         7CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.5/CoinUtils
         8Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.54/Cgl
         9Clp               https://projects.coin-or.org/svn/Clp/stable/1.11/Clp
         10Osi               https://projects.coin-or.org/svn/Osi/stable/0.100/Osi
         11Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
  • branches/reengAnn/Cbc/src/CbcNode.cpp

    r1265 r1304  
    24982498  OsiSolverInterface *osiclp = NULL ;
    24992499# endif
    2500   const CglTreeProbingInfo * probingInfo = NULL; //model->probingInfo();
     2500  //const CglTreeProbingInfo * probingInfo = NULL; //model->probingInfo();
    25012501  // Old code left in with DEPRECATED_STRATEGY
    25022502  assert (model->searchStrategy()==-1||
     
    26422642      sumInfeasibilities_ = 0.0;
    26432643      int bestPriority=COIN_INT_MAX;
     2644#if 0
    26442645      int number01 = 0;
    26452646      const cliqueEntry * entry = NULL;
     
    26602661        }
    26612662      }
     2663#endif
    26622664      /*
    26632665        Scan for branching objects that indicate infeasibility. Choose candidates
     
    27982800              infeasibility = 0.5-fabs(0.5-part);
    27992801            }
     2802#if 0
    28002803            if (probingInfo) {
    28012804              int iSeq = backward[iColumn];
     
    28092812              }
    28102813            }
     2814#endif
    28112815          } else {
    28122816            // see if SOS
     
    29042908      }
    29052909      if (numberUnsatisfied_) {
    2906         if (probingInfo&&false)
    2907           printf("nunsat %d, %d probed, %d other 0-1\n",numberUnsatisfied_,
    2908                 numberUnsatisProbed,numberUnsatisNotProbed);
     2910        //if (probingInfo&&false)
     2911        //printf("nunsat %d, %d probed, %d other 0-1\n",numberUnsatisfied_,
     2912        // numberUnsatisProbed,numberUnsatisNotProbed);
    29092913        // some infeasibilities - go to next steps
    29102914        if (!canDoOneHot&&hotstartSolution) {
  • branches/reengAnn/Cbc/src/CbcSolver.cpp

    r1265 r1304  
    37333733    anyToDo=true;
    37343734  }
    3735   if (useCombine>=type&&useCombine>=kType&&useCombine<=kType+1) {
     3735  if (useCombine>=kType&&useCombine<=kType+1) {
    37363736    CbcHeuristicLocal heuristic2(*model);
    37373737    heuristic2.setHeuristicName("combine solutions");
     
    54585458                if (iStatus==0) {
    54595459                  iStatus2=0;
    5460                   // set best solution in model
    5461                   model_.setBestSolution(model2->primalColumnSolution(),
    5462                                          model2->numberColumns(),
    5463                                          model2->getObjValue()*
    5464                                          model2->getObjSense());
     5460                  if(found.type()==BAB) {
     5461                    // set best solution in model as no integers
     5462                    model_.setBestSolution(model2->primalColumnSolution(),
     5463                                           model2->numberColumns(),
     5464                                           model2->getObjValue()*
     5465                                           model2->getObjSense());
     5466                  }
    54655467                } else if (iStatus==1) {
    54665468                  iStatus=0;
  • branches/reengAnn/Externals

    r1196 r1304  
    1 BuildTools    https://projects.coin-or.org/svn/BuildTools/trunk
    2 ThirdParty/ASL https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
    3 ThirdParty/Blas https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
     1BuildTools        https://projects.coin-or.org/svn/BuildTools/stable/0.5
     2ThirdParty/ASL    https://projects.coin-or.org/svn/BuildTools/ThirdParty/ASL/stable/1.0
     3ThirdParty/Blas   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Blas/stable/1.0
    44ThirdParty/Lapack https://projects.coin-or.org/svn/BuildTools/ThirdParty/Lapack/stable/1.0
    5 ThirdParty/Glpk https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
    6 Data/Sample   https://projects.coin-or.org/svn/Data/trunk/Sample
    7 CoinUtils     https://projects.coin-or.org/svn/CoinUtils/trunk/CoinUtils
    8 Cgl           https://projects.coin-or.org/svn/Cgl/trunk/Cgl
    9 Clp           https://projects.coin-or.org/svn/Clp/trunk/Clp
    10 Osi           https://projects.coin-or.org/svn/Osi/trunk/Osi
    11 Vol           https://projects.coin-or.org/svn/Vol/trunk/Vol
     5ThirdParty/Glpk   https://projects.coin-or.org/svn/BuildTools/ThirdParty/Glpk/stable/1.5
     6Data/Sample       https://projects.coin-or.org/svn/Data/stable/1.0/Sample
     7CoinUtils         https://projects.coin-or.org/svn/CoinUtils/stable/2.5/CoinUtils
     8Cgl               https://projects.coin-or.org/svn/Cgl/stable/0.54/Cgl
     9Clp               https://projects.coin-or.org/svn/Clp/stable/1.11/Clp
     10Osi               https://projects.coin-or.org/svn/Osi/stable/0.100/Osi
     11Vol               https://projects.coin-or.org/svn/Vol/stable/1.1/Vol
Note: See TracChangeset for help on using the changeset viewer.