Changeset 818 for stable


Ignore:
Timestamp:
Oct 8, 2007 8:13:12 AM (12 years ago)
Author:
forrest
Message:

allow more of a mix of objects

File:
1 edited

Legend:

Unmodified
Added
Removed
  • stable/2.0/Cbc/src/CbcModel.cpp

    r789 r818  
    878878        }
    879879      }
    880       // and add to solver if none
    881       if (!solver_->numberObjects()) {
    882         solver_->addObjects(numberObjects_,object_);
    883       } else {
    884         if (solver_->numberObjects()!=numberOriginalObjects) {
    885           printf("should have trapped that solver has objects before\n");
    886           abort();
    887         }
    888       }
     880      // and add to solver
     881      solver_->addObjects(numberObjects_,object_);
    889882    } else {
    890883      // do from solver
     
    70297022        mark[iColumn]=i;
    70307023      }
     7024    } else {
     7025      // not integer - keep
     7026      newNumberObjects++;
    70317027    }
    70327028  }
Note: See TracChangeset for help on using the changeset viewer.