Ignore:
Timestamp:
Mar 10, 2007 7:27:13 PM (13 years ago)
Author:
forrest
Message:

probably breaking everything

File:
1 edited

Legend:

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

    r539 r574  
    565565        // If model has stored then add cut (if convex)
    566566        // off until I work out problem with ibell3a
    567         if (cbcModel&&(specialOptions2_&4)!=0&&quadraticModel_&&false) {
     567        if (cbcModel&&(specialOptions2_&4)!=0&&quadraticModel_) {
    568568          int numberGenerators = cbcModel_->numberCutGenerators();
    569569          int iGenerator;
     
    10541054    printf("There are %d bilinear and %d integers\n",nBi,nInt);
    10551055    loadFromCoinModel(coinModel,true);
    1056     if (tightenBounds) {
     1056    if (tightenBounds&&numberColumns<100) {
    10571057      // first fake bounds
    10581058      for (iColumn=0;iColumn<numberColumns;iColumn++) {
     
    14771477        obj->setPriority(value);
    14781478      }
     1479    }
     1480  }
     1481}
     1482// Say convex (should work it out)
     1483void
     1484OsiSolverLink::sayConvex(bool convex)
     1485{
     1486  specialOptions2_ |= 4;
     1487  if (convex_) {
     1488    for (int iNon=0;iNon<numberNonLinearRows_;iNon++) {
     1489      convex_[iNon]=convex ? 1 : -1;
    14791490    }
    14801491  }
     
    24372448    if ((status==0||statusNegative==0)&&numberLong) {
    24382449      // need to do more work
    2439       printf("Needs more work\n");
     2450      //printf("Needs more work\n");
    24402451    }
    24412452    assert (status>0||statusNegative>0);
Note: See TracChangeset for help on using the changeset viewer.