diff --git a/cylp/cpp/ICbcModel.cpp b/cylp/cpp/ICbcModel.cpp index a3bab13b..15998ec8 100644 --- a/cylp/cpp/ICbcModel.cpp +++ b/cylp/cpp/ICbcModel.cpp @@ -8,7 +8,7 @@ PyObject* ICbcModel::getPrimalVariableSolution(){ _import_array(); npy_intp dims = this->solver()->getNumCols(); double* d = (double*)(this->solver()->getColSolution()); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, d ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, d ); return Arr; } diff --git a/cylp/cpp/IClpSimplex.cpp b/cylp/cpp/IClpSimplex.cpp index 512ff300..93861222 100644 --- a/cylp/cpp/IClpSimplex.cpp +++ b/cylp/cpp/IClpSimplex.cpp @@ -345,7 +345,7 @@ bool IClpSimplex::varIsFixed(int ind){ PyObject* IClpSimplex::getStatusArray(){ npy_intp dims = getNumCols() + getNumRows(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_UINT8, this->status_ ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_UINT8, this->status_ ); return Arr; } @@ -354,7 +354,7 @@ PyObject* IClpSimplex::getStatusArray(){ PyObject* IClpSimplex::getReducedCosts(){ npy_intp dims = getNumCols() + getNumRows(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->djRegion() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->djRegion() ); return Arr; } @@ -370,7 +370,7 @@ void IClpSimplex::setReducedCosts(double* rc){ PyObject* IClpSimplex::getComplementarityList(){ npy_intp dims = getNumCols() + getNumRows(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_INT32, QP_ComplementarityList ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_INT32, QP_ComplementarityList ); return Arr; } @@ -378,7 +378,7 @@ PyObject* IClpSimplex::getComplementarityList(){ PyObject* IClpSimplex::getPivotVariable(){ npy_intp dims = getNumRows(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_INT32, this->pivotVariable() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_INT32, this->pivotVariable() ); return Arr; } @@ -387,7 +387,7 @@ PyObject* IClpSimplex::getPivotVariable(){ PyObject* IClpSimplex::getPrimalRowSolution(){ npy_intp dims = getNumRows(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->primalRowSolution() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->primalRowSolution() ); return Arr; } @@ -395,33 +395,33 @@ PyObject* IClpSimplex::getPrimalRowSolution(){ PyObject* IClpSimplex::getPrimalColumnSolution(){ npy_intp dims = getNumCols(); - PyObject *Arr = PyArray_SimpleNewFromData(1, &dims, PyArray_DOUBLE, this->primalColumnSolution() ); + PyObject *Arr = PyArray_SimpleNewFromData(1, &dims, NPY_DOUBLE, this->primalColumnSolution() ); return Arr; } PyObject* IClpSimplex::getPrimalColumnSolutionAll(){ npy_intp dims = getNumCols() + getNumRows(); - PyObject *Arr = PyArray_SimpleNewFromData(1, &dims, PyArray_DOUBLE, this->primalColumnSolution() ); + PyObject *Arr = PyArray_SimpleNewFromData(1, &dims, NPY_DOUBLE, this->primalColumnSolution() ); return Arr; } PyObject* IClpSimplex::getSolutionRegion(){ npy_intp dims = getNumCols() + getNumRows(); - PyObject *Arr = PyArray_SimpleNewFromData(1, &dims, PyArray_DOUBLE, this->solutionRegion() ); + PyObject *Arr = PyArray_SimpleNewFromData(1, &dims, NPY_DOUBLE, this->solutionRegion() ); return Arr; } PyObject* IClpSimplex::getCostRegion(){ npy_intp dims = getNumCols() + getNumRows(); - PyObject *Arr = PyArray_SimpleNewFromData(1, &dims, PyArray_DOUBLE, this->costRegion() ); + PyObject *Arr = PyArray_SimpleNewFromData(1, &dims, NPY_DOUBLE, this->costRegion() ); return Arr; } PyObject* IClpSimplex::getDualRowSolution(){ npy_intp dims = getNumRows(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->dualRowSolution() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->dualRowSolution() ); return Arr; } @@ -429,7 +429,7 @@ PyObject* IClpSimplex::getDualRowSolution(){ PyObject* IClpSimplex::getDualColumnSolution(){ npy_intp dims = getNumCols(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->dualColumnSolution() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->dualColumnSolution() ); return Arr; } @@ -437,63 +437,63 @@ PyObject* IClpSimplex::getDualColumnSolution(){ PyObject* IClpSimplex::getObjective(){ npy_intp dims = getNumCols(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->objective() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->objective() ); return Arr; } PyObject* IClpSimplex::getRowLower(){ npy_intp dims = getNumRows(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->rowLower() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->rowLower() ); return Arr; } PyObject* IClpSimplex::getRowUpper(){ npy_intp dims = getNumRows(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->rowUpper() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->rowUpper() ); return Arr; } PyObject* IClpSimplex::getUpper(){ npy_intp dims = getNumRows() + getNumCols(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->upperRegion() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->upperRegion() ); return Arr; } PyObject* IClpSimplex::getLower(){ npy_intp dims = getNumRows() + getNumCols(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->lowerRegion() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->lowerRegion() ); return Arr; } PyObject* IClpSimplex::getColLower(){ npy_intp dims = getNumCols(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->columnLower() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->columnLower() ); return Arr; } PyObject* IClpSimplex::getColUpper(){ npy_intp dims = getNumCols(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->columnUpper() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->columnUpper() ); return Arr; } PyObject* IClpSimplex::getColumnScale(){ npy_intp dims = getNumCols(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, columnScale_); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, columnScale_); return Arr; } PyObject* IClpSimplex::getRowScale(){ npy_intp dims = getNumRows(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, rowScale_ ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, rowScale_ ); return Arr; } @@ -503,9 +503,9 @@ PyObject* IClpSimplex::getIntegerInformation(){ npy_intp dims = getNumCols(); PyObject* Arr; if (this->integerInformation()) - Arr = PyArray_SimpleNewFromData(1, &dims, PyArray_INT8, this->integerInformation()); + Arr = PyArray_SimpleNewFromData(1, &dims, NPY_INT8, this->integerInformation()); else - Arr = PyArray_ZEROS(1, &dims, PyArray_INT8, 0); + Arr = PyArray_ZEROS(1, &dims, NPY_INT8, 0); return Arr; } @@ -1391,7 +1391,7 @@ PyObject* IClpSimplex::filterVars(PyObject* inds){ npy_intp inds_len = PyArray_DIM(inds, 0); if (inds_len == 0){ npy_intp dims = 0; - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_INT, tempIntArray ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_INT, tempIntArray ); return Arr; } if (tempArrayExists == false) @@ -1417,7 +1417,7 @@ PyObject* IClpSimplex::filterVars(PyObject* inds){ } npy_intp dims = ind_count; - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_INT, tempIntArray ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_INT, tempIntArray ); return Arr; } diff --git a/cylp/cpp/ICoinIndexedVector.cpp b/cylp/cpp/ICoinIndexedVector.cpp index 2b2c35f7..af4c352d 100644 --- a/cylp/cpp/ICoinIndexedVector.cpp +++ b/cylp/cpp/ICoinIndexedVector.cpp @@ -9,7 +9,7 @@ PyObject* ICoinIndexedVector::getIndicesNPArray(){ npy_intp dims = this->getNumElements(); PyObject *Arr = PyArray_SimpleNewFromData(1, &dims, - PyArray_INT32, + NPY_INT32, this->getIndices()); return Arr; } @@ -18,7 +18,7 @@ PyObject* ICoinIndexedVector::getDenseVectorNPArray(){ npy_intp dims = this->capacity(); PyObject *Arr = PyArray_SimpleNewFromData(1, &dims, - PyArray_DOUBLE, + NPY_DOUBLE, this->denseVector()); return Arr; } diff --git a/cylp/cpp/ICoinMpsIO.cpp b/cylp/cpp/ICoinMpsIO.cpp index 2fdf8ce9..f74f75c8 100644 --- a/cylp/cpp/ICoinMpsIO.cpp +++ b/cylp/cpp/ICoinMpsIO.cpp @@ -88,7 +88,7 @@ double * ICoinMpsIO::IObjCoefficients() const PyObject* ICoinMpsIO::np_getColLower(){ npy_intp dims = this->getNumCols(); _import_array(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->IColLower() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->IColLower() ); return Arr; } @@ -96,14 +96,14 @@ PyObject* ICoinMpsIO::np_getColLower(){ PyObject* ICoinMpsIO::np_getColUpper(){ npy_intp dims = this->getNumCols(); _import_array(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->IColUpper() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->IColUpper() ); return Arr; } PyObject* ICoinMpsIO::np_getRowSense(){ npy_intp dims = this->getNumRows(); _import_array(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_INT8, this->IRowSense() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_INT8, this->IRowSense() ); return Arr; } @@ -111,42 +111,42 @@ PyObject* ICoinMpsIO::np_getRowSense(){ PyObject* ICoinMpsIO::np_getRightHandSide(){ npy_intp dims = this->getNumRows(); _import_array(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->IRightHandSide() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->IRightHandSide() ); return Arr; } PyObject* ICoinMpsIO::np_getRowRange(){ npy_intp dims = this->getNumRows(); _import_array(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->IRowRange() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->IRowRange() ); return Arr; } PyObject* ICoinMpsIO::np_getRowLower(){ npy_intp dims = this->getNumRows(); _import_array(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->IRowLower() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->IRowLower() ); return Arr; } PyObject* ICoinMpsIO::np_getRowUpper(){ npy_intp dims = this->getNumRows(); _import_array(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->IRowUpper() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->IRowUpper() ); return Arr; } PyObject* ICoinMpsIO::np_getObjCoefficients(){ npy_intp dims = this->getNumCols(); _import_array(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->IObjCoefficients() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->IObjCoefficients() ); return Arr; } PyObject* ICoinMpsIO::np_integerColumns(){ npy_intp dims = this->getNumCols(); _import_array(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_INT8, this->IintegerColumns() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_INT8, this->IintegerColumns() ); return Arr; } @@ -154,21 +154,21 @@ PyObject* ICoinMpsIO::np_integerColumns(){ PyObject* ICoinMpsIO::getQPColumnStarts(){ npy_intp dims = this->getNumCols() + 1; _import_array(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_INT32, d_colStart ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_INT32, d_colStart ); return Arr; } PyObject* ICoinMpsIO::getQPColumns(){ npy_intp dims = d_colStart[this->getNumCols()]; _import_array(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_INT32, d_cols ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_INT32, d_cols ); return Arr; } PyObject* ICoinMpsIO::getQPElements(){ npy_intp dims = d_colStart[this->getNumCols()]; _import_array(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, d_elements ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, d_elements ); return Arr; } diff --git a/cylp/cpp/ICoinPackedMatrix.cpp b/cylp/cpp/ICoinPackedMatrix.cpp index a3926e98..1696dd30 100644 --- a/cylp/cpp/ICoinPackedMatrix.cpp +++ b/cylp/cpp/ICoinPackedMatrix.cpp @@ -4,7 +4,7 @@ PyObject* ICoinPackedMatrix::np_getIndices(){ npy_intp dims = this->getNumElements(); _import_array(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_INT32, this->IgetIndices() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_INT32, this->IgetIndices() ); return Arr; } @@ -12,7 +12,7 @@ PyObject* ICoinPackedMatrix::np_getElements(){ npy_intp dims = this->getNumElements(); _import_array(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_DOUBLE, this->IgetElements() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_DOUBLE, this->IgetElements() ); return Arr; } @@ -20,7 +20,7 @@ PyObject* ICoinPackedMatrix::np_getMajorIndices(){ npy_intp dims = this->getNumElements(); _import_array(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_INT32, this->getMajorIndices() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_INT32, this->getMajorIndices() ); return Arr; } @@ -28,7 +28,7 @@ PyObject* ICoinPackedMatrix::np_getMajorIndices(){ PyObject* ICoinPackedMatrix::np_getVectorStarts(){ npy_intp dims = this->getMajorDim() + 1; _import_array(); - PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, PyArray_INT32, this->IgetVectorStarts() ); + PyObject *Arr = PyArray_SimpleNewFromData( 1, &dims, NPY_INT32, this->IgetVectorStarts() ); return Arr; }