Changeset 614 for branches/devel/Cbc/src/CbcSolver.cpp
- Timestamp:
- May 17, 2007 9:55:22 AM (14 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/devel/Cbc/src/CbcSolver.cpp
r613 r614 4016 4016 } 4017 4017 solver3->setCbcModel(babModel); 4018 babModel->addCutGenerator(&stored,1,"Stored"); 4018 if (stored.sizeRowCuts()) 4019 babModel->addCutGenerator(&stored,1,"Stored"); 4019 4020 CglTemporary temp; 4020 4021 babModel->addCutGenerator(&temp,1,"OnceOnly"); … … 4028 4029 OsiSolverLink * solver3 = dynamic_cast<OsiSolverLink *> (babModel->solver()); 4029 4030 assert (solver3) ; 4031 int extra1 = parameters[whichParam(EXTRA1,numberParameters,parameters)].intValue(); 4032 solver3->setBiLinearPriority(extra1); 4033 printf("bilinear priority now %d\n",extra1); 4030 4034 double * solution = solver3->heuristicSolution(slpValue>0 ? slpValue : 20 ,1.0e-5,testOsiOptions-10); 4031 4035 assert(solution); … … 4606 4610 int status; 4607 4611 ClpSimplex * lpSolver = clpSolver->getModelPtr(); 4608 if (!gmpl) 4612 if (!gmpl) { 4609 4613 status =clpSolver->readMps(fileName.c_str(), 4610 4614 keepImportNames!=0, 4611 4615 allowImportErrors!=0); 4616 if (!status||(status>0&&allowImportErrors)) { 4617 if (keepImportNames) { 4618 lengthName = lpSolver->lengthNames(); 4619 rowNames = *(lpSolver->rowNames()); 4620 columnNames = *(lpSolver->columnNames()); 4621 } else { 4622 lengthName=0; 4623 } 4624 } 4625 } 4612 4626 else if (gmpl>0) 4613 4627 status= lpSolver->readGMPL(fileName.c_str(),
Note: See TracChangeset
for help on using the changeset viewer.