73 lines
3.6 KiB
Diff
73 lines
3.6 KiB
Diff
diff -up Clp-releases-1.17.5/Clp/src/ClpModel.cpp.orig Clp-releases-1.17.5/Clp/src/ClpModel.cpp
|
|
--- Clp-releases-1.17.5/Clp/src/ClpModel.cpp.orig 2020-02-20 09:56:18.361626298 -0700
|
|
+++ Clp-releases-1.17.5/Clp/src/ClpModel.cpp 2020-02-20 09:56:58.777910020 -0700
|
|
@@ -1338,7 +1338,7 @@ void ClpModel::resize(int newNumberRows,
|
|
rowNames_.resize(newNumberRows);
|
|
lengthNames_ = CoinMax(lengthNames_, 8);
|
|
char name[12];
|
|
- for (unsigned int iRow = numberRowNames; iRow < newNumberRows; iRow++) {
|
|
+ for (int iRow = numberRowNames; iRow < newNumberRows; iRow++) {
|
|
sprintf(name, "R%7.7d", iRow);
|
|
rowNames_[iRow] = name;
|
|
}
|
|
@@ -1348,7 +1348,7 @@ void ClpModel::resize(int newNumberRows,
|
|
columnNames_.resize(newNumberColumns);
|
|
lengthNames_ = CoinMax(lengthNames_, 8);
|
|
char name[12];
|
|
- for (unsigned int iColumn = numberColumnNames;
|
|
+ for (int iColumn = numberColumnNames;
|
|
iColumn < newNumberColumns; iColumn++) {
|
|
sprintf(name, "C%7.7d", iColumn);
|
|
columnNames_[iColumn] = name;
|
|
@@ -3556,7 +3556,7 @@ void ClpModel::copyRowNames(const char *
|
|
int size = static_cast< int >(rowNames_.size());
|
|
if (size != numberRows_)
|
|
rowNames_.resize(numberRows_);
|
|
- unsigned int iRow;
|
|
+ int iRow;
|
|
for (iRow = first; iRow < last; iRow++) {
|
|
if (rowNames && rowNames[iRow - first] && strlen(rowNames[iRow - first])) {
|
|
rowNames_[iRow] = rowNames[iRow - first];
|
|
@@ -3583,7 +3583,7 @@ void ClpModel::copyColumnNames(const cha
|
|
int size = static_cast< int >(columnNames_.size());
|
|
if (size != numberColumns_)
|
|
columnNames_.resize(numberColumns_);
|
|
- unsigned int iColumn;
|
|
+ int iColumn;
|
|
for (iColumn = first; iColumn < last; iColumn++) {
|
|
if (columnNames && columnNames[iColumn - first] && strlen(columnNames[iColumn - first])) {
|
|
columnNames_[iColumn] = columnNames[iColumn - first];
|
|
@@ -3831,7 +3831,7 @@ ClpModel::rowNamesAsChar() const
|
|
rowNames = new char *[numberRows_ + 1];
|
|
int numberNames = static_cast< int >(rowNames_.size());
|
|
numberNames = CoinMin(numberRows_, numberNames);
|
|
- unsigned int iRow;
|
|
+ int iRow;
|
|
for (iRow = 0; iRow < numberNames; iRow++) {
|
|
if (rowName(iRow) != "") {
|
|
rowNames[iRow] = CoinStrdup(rowName(iRow).c_str());
|
|
@@ -3870,7 +3870,7 @@ ClpModel::columnNamesAsChar() const
|
|
columnNames = new char *[numberColumns_];
|
|
int numberNames = static_cast< int >(columnNames_.size());
|
|
numberNames = CoinMin(numberColumns_, numberNames);
|
|
- unsigned int iColumn;
|
|
+ int iColumn;
|
|
for (iColumn = 0; iColumn < numberNames; iColumn++) {
|
|
if (columnName(iColumn) != "") {
|
|
columnNames[iColumn] = CoinStrdup(columnName(iColumn).c_str());
|
|
diff -up Clp-releases-1.17.5/Clp/src/ClpSolver.cpp.orig Clp-releases-1.17.5/Clp/src/ClpSolver.cpp
|
|
--- Clp-releases-1.17.5/Clp/src/ClpSolver.cpp.orig 2020-02-20 09:54:26.139615157 -0700
|
|
+++ Clp-releases-1.17.5/Clp/src/ClpSolver.cpp 2020-02-20 09:56:58.777910020 -0700
|
|
@@ -3799,9 +3799,9 @@ static void statistics(ClpSimplex *origi
|
|
numberWritten = fwrite(stats, sizeof(int), 3, fpBlocks);
|
|
assert(numberWritten == 3);
|
|
numberWritten = fwrite(blockStart, sizeof(int), numberRows, fpBlocks);
|
|
- assert(numberWritten == numberRows);
|
|
+ assert(numberWritten == (size_t)numberRows);
|
|
numberWritten = fwrite(columnBlock, sizeof(int), numberColumns, fpBlocks);
|
|
- assert(numberWritten == numberColumns);
|
|
+ assert(numberWritten == (size_t)numberColumns);
|
|
fclose(fpBlocks);
|
|
if (writeMatrices) {
|
|
int *whichRows = new int[numberRows + numberColumns];
|