Changeset 578 for branches


Ignore:
Timestamp:
Mar 14, 2007 12:38:06 PM (12 years ago)
Author:
forrest
Message:

for Jon

Location:
branches/devel/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Cbc/src/CbcLinked.cpp

    r574 r578  
    10691069      tempModel.deleteRows(nDelete,freeRow);
    10701070      tempModel.setOptimizationDirection(1.0);
    1071       if (logLevel<3)
     1071      if (logLevel<3) {
    10721072        tempModel.setLogLevel(0);
     1073        tempModel.setSpecialOptions(32768);
     1074      }
    10731075      double * objective = tempModel.objective();
    10741076      CoinZeroN(objective,numberColumns);
     
    25492551  bestObjectiveValue_ =1.0e100;
    25502552  defaultMeshSize_ = 1.0e-4;
    2551   defaultBound_ = 1.0e4;
     2553  defaultBound_ = 1.0e5;
    25522554  integerPriority_ = 1000;
    25532555  biLinearPriority_ = 10000;
     
    43554357  yB[0]=info->lower_[yColumn_];
    43564358  yB[1]=info->upper_[yColumn_];
     4359#if 0
     4360  if (info->lower_[1]<=43.0&&info->upper_[1]>=43.0) {
     4361    if (info->lower_[4]<=49.0&&info->upper_[4]>=49.0) {
     4362      if (info->lower_[2]<=16.0&&info->upper_[2]>=16.0) {
     4363        if (info->lower_[3]<=19.0&&info->upper_[3]>=19.0) {
     4364          printf("feas %g %g %g %g  p %g t %g\n",
     4365                info->solution_[1],
     4366                info->solution_[2],
     4367                info->solution_[3],
     4368                info->solution_[4],
     4369                info->solution_[0],
     4370                info->solution_[5]);
     4371        }
     4372      }
     4373    }
     4374  }
     4375#endif
    43574376  double x = info->solution_[xColumn_];
    43584377  x = CoinMax(x,xB[0]);
  • branches/devel/Cbc/src/CoinSolve.cpp

    r577 r578  
    455455    model.analyzeObjective();
    456456    double increment2=model.getCutoffIncrement();
    457     if (increment2>increment) {
     457    if (increment2>increment&&increment2>0.0) {
    458458      if (!noPrinting)
    459459        printf("cutoff increment increased from %g to %g\n",increment,increment2);
     
    14321432    parameters[whichParam(INFEASIBILITYWEIGHT,numberParameters,parameters)].setDoubleValue(model.getDblParam(CbcModel::CbcInfeasibilityWeight));
    14331433    parameters[whichParam(INTEGERTOLERANCE,numberParameters,parameters)].setDoubleValue(model.getDblParam(CbcModel::CbcIntegerTolerance));
     1434    double normalIncrement=model.getCutoffIncrement();;
    14341435    parameters[whichParam(INCREMENT,numberParameters,parameters)].setDoubleValue(model.getDblParam(CbcModel::CbcCutoffIncrement));
    14351436    parameters[whichParam(TESTOSI,numberParameters,parameters)].setIntValue(testOsiParameters);
     
    32813282              double increment=babModel->getCutoffIncrement();;
    32823283              int * changed = NULL;
    3283               if (!miplib)
     3284              if (!miplib&&increment==normalIncrement)
    32843285                changed=analyze( osiclp,numberChanged,increment,false);
    32853286              if (debugValues) {
Note: See TracChangeset for help on using the changeset viewer.