Changeset 1038


Ignore:
Timestamp:
Jul 29, 2008 9:10:47 AM (11 years ago)
Author:
forrest
Message:

fix bugs when Ipopt runs inside Cbc

Location:
trunk/Cbc/src
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/Cbc/src/CbcBranchActual.cpp

    r931 r1038  
    585585    assert (sum>0.0);
    586586    weight /= sum;
    587     if (info->defaultDual_>=0.0&&info->usefulRegion_) {
     587    if (info->defaultDual_>=0.0&&info->usefulRegion_&&info->columnStart_) {
    588588      assert (sosType_==1);
    589589      int iWhere;
  • trunk/Cbc/src/CbcNode.cpp

    r936 r1038  
    24212421  int saveStateOfSearch = model->stateOfSearch();
    24222422  int numberStrong=model->numberStrong();
    2423   if (!auxiliaryInfo->warmStart())
    2424     numberStrong=0;
     2423  //if (!auxiliaryInfo->warmStart())
     2424  //numberStrong=0;
    24252425  // But make more likely to get out after some times
    24262426  int changeStrategy=numberStrong;
     
    30853085          solver->markHotStart();
    30863086        }
    3087         assert (auxiliaryInfo->warmStart());
    30883087        doneHotStart=true;
    30893088        xMark++;
     
    31373136          solver->markHotStart();
    31383137          doneHotStart=true;
    3139           assert (auxiliaryInfo->warmStart());
    31403138          xMark++;
    31413139          //if (solver->isProvenPrimalInfeasible())
     
    31513149        // Mark hot start
    31523150        doneHotStart=true;
    3153         assert (auxiliaryInfo->warmStart());
    31543151        solver->markHotStart();
    31553152        xMark++;
     
    34563453            // Mark hot start
    34573454            doneHotStart=true;
    3458             assert (auxiliaryInfo->warmStart());
    34593455            solver->markHotStart();
    34603456            xMark++;
Note: See TracChangeset for help on using the changeset viewer.