Changeset 862 for branches


Ignore:
Timestamp:
Sep 29, 2006 4:59:22 PM (13 years ago)
Author:
forrest
Message:

for integer sync

Location:
branches/devel/Clp/src
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/devel/Clp/src/ClpModel.cpp

    r854 r862  
    12991299    }
    13001300#endif
    1301     if (elements)
    1302       matrix_->appendMatrix(number,0,rowStarts,columns,elements);
     1301    //if (elements)
     1302    matrix_->appendMatrix(number,0,rowStarts,columns,elements);
    13031303  }
    13041304}
     
    17801780    }
    17811781#endif
    1782     if (elements)
    1783       matrix_->appendMatrix(number,1,columnStarts,rows,elements);
     1782    //if (elements)
     1783    matrix_->appendMatrix(number,1,columnStarts,rows,elements);
    17841784  }
    17851785}
  • branches/devel/Clp/src/ClpSimplex.cpp

    r854 r862  
    58005800  }
    58015801  int returnCode = ClpModel::loadProblem(modelObject);
     5802  const int * integerType = modelObject.integerTypeArray();
     5803  if (integerType) {
     5804    for (int iColumn=0;iColumn<numberColumns_;iColumn++) {
     5805      if (integerType[iColumn])
     5806        setInteger(iColumn);
     5807    }
     5808  }
    58025809  createStatus();
    58035810  if (status) {
  • branches/devel/Clp/src/ClpSimplexDual.cpp

    r861 r862  
    320320          if (perturbation_>=101)
    321321            computeDuals(NULL);
     322          //gutsOfSolution(NULL,NULL);
    322323        } else if (numberDualInfeasibilities_) {
    323324          problemStatus_=10;
Note: See TracChangeset for help on using the changeset viewer.