Ignore:
Timestamp:
Oct 8, 2006 7:33:47 PM (13 years ago)
Author:
forrest
Message:

towards common use with other solvers

File:
1 edited

Legend:

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

    r424 r439  
    382382            numberIntegers = model.numberIntegers();
    383383          }
    384           CbcObject ** oldObjects = model.objects();
     384          OsiObject ** oldObjects = model.objects();
    385385          // Do sets and priorities
    386           CbcObject ** objects = new CbcObject * [numberSOS];
     386          OsiObject ** objects = new OsiObject * [numberSOS];
    387387          // set old objects to have low priority
    388388          int numberOldObjects = model.numberObjects();
     
    422422            for (int iObject=0;iObject<model.numberObjects();iObject++) {
    423423              // redo ids etc
    424               model.modifiableObject(iObject)->redoSequenceEtc(&model,n,fake);
     424              CbcSimpleInteger * obj =
     425                dynamic_cast <CbcSimpleInteger *>(model.modifiableObject(iObject)) ;
     426              if (obj) {
     427                obj->resetSequenceEtc(n,fake);
     428              } else {
     429                // redo ids etc
     430                CbcObject * obj =
     431                  dynamic_cast <CbcObject *>(model.modifiableObject(iObject)) ;
     432                assert (obj);
     433                obj->redoSequenceEtc(&model,n,fake);
     434              }
    425435            }
    426436            delete [] fake;
Note: See TracChangeset for help on using the changeset viewer.