- Timestamp:
- May 2, 2011 4:58:39 AM (10 years ago)
- Location:
- trunk/Clp/src
- Files:
-
- 10 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/Clp/src/CbcOrClpParam.cpp
r1724 r1726 4 4 // This code is licensed under the terms of the Eclipse Public License (EPL). 5 5 6 #if defined(_MSC_VER) 7 // Turn off compiler warning about long names 8 # pragma warning(disable:4786) 9 #endif 10 6 #include "CoinPragma.hpp" 11 7 #include "CbcOrClpParam.hpp" 12 8 … … 537 533 #endif 538 534 case CLP_PARAM_DBL_ZEROTOLERANCE: 539 model->setSmallElementValue(value);535 value = model->getSmallElementValue(); 540 536 break; 541 537 case CLP_PARAM_DBL_DUALBOUND: … … 1020 1016 extern int CbcOrClpRead_mode; 1021 1017 int CbcOrClpEnvironmentIndex = -1; 1022 static int fillEnv()1018 static size_t fillEnv() 1023 1019 { 1024 1020 #if defined(_MSC_VER) || defined(__MSVCRT__) … … 1027 1023 // Don't think it will work on Windows 1028 1024 char * environ = getenv("CBC_CLP_ENVIRONMENT"); 1029 int length = 0;1025 size_t length = 0; 1030 1026 if (environ) { 1031 1027 length = strlen(environ); 1032 if (CbcOrClpEnvironmentIndex < length) {1028 if (CbcOrClpEnvironmentIndex < static_cast<int>(length)) { 1033 1029 // find next non blank 1034 1030 char * whereEnv = environ + CbcOrClpEnvironmentIndex; … … 1047 1043 whereEnv++; 1048 1044 } 1049 CbcOrClpEnvironmentIndex = whereEnv - environ;1045 CbcOrClpEnvironmentIndex = static_cast<int>(whereEnv - environ); 1050 1046 *put = '\0'; 1051 1047 length = strlen(line); … … 1236 1232 afterEquals = ""; 1237 1233 } 1238 int value = 0;1234 long int value = 0; 1239 1235 //std::cout<<field<<std::endl; 1240 1236 if (field != "EOL") { … … 1252 1248 *valid = 2; 1253 1249 } 1254 return value;1250 return static_cast<int>(value); 1255 1251 } 1256 1252 double … … 3405 3401 if (numberRows == numberRowsFile && numberColumns == numberColumnsFile) { 3406 3402 nRead = fread(primalRowSolution, sizeof(double), numberRows, fp); 3407 if (nRead != numberRows)3403 if (nRead != static_cast<size_t>(numberRows)) 3408 3404 throw("Error in fread"); 3409 3405 nRead = fread(dualRowSolution, sizeof(double), numberRows, fp); 3410 if (nRead != numberRows)3406 if (nRead != static_cast<size_t>(numberRows)) 3411 3407 throw("Error in fread"); 3412 3408 nRead = fread(primalColumnSolution, sizeof(double), numberColumns, fp); 3413 if (nRead != numberColumns)3409 if (nRead != static_cast<size_t>(numberColumns)) 3414 3410 throw("Error in fread"); 3415 3411 nRead = fread(dualColumnSolution, sizeof(double), numberColumns, fp); 3416 if (nRead != numberColumns)3412 if (nRead != static_cast<size_t>(numberColumns)) 3417 3413 throw("Error in fread"); 3418 3414 } else { … … 3420 3416 double * temp = new double [CoinMax(numberRowsFile, numberColumnsFile)]; 3421 3417 nRead = fread(temp, sizeof(double), numberRowsFile, fp); 3422 if (nRead != numberRowsFile)3418 if (nRead != static_cast<size_t>(numberRowsFile)) 3423 3419 throw("Error in fread"); 3424 3420 CoinMemcpyN(temp, numberRows, primalRowSolution); 3425 3421 nRead = fread(temp, sizeof(double), numberRowsFile, fp); 3426 if (nRead != numberRowsFile)3422 if (nRead != static_cast<size_t>(numberRowsFile)) 3427 3423 throw("Error in fread"); 3428 3424 CoinMemcpyN(temp, numberRows, dualRowSolution); 3429 3425 nRead = fread(temp, sizeof(double), numberColumnsFile, fp); 3430 if (nRead != numberColumnsFile)3426 if (nRead != static_cast<size_t>(numberColumnsFile)) 3431 3427 throw("Error in fread"); 3432 3428 CoinMemcpyN(temp, numberColumns, primalColumnSolution); 3433 3429 nRead = fread(temp, sizeof(double), numberColumnsFile, fp); 3434 if (nRead != numberColumnsFile)3430 if (nRead != static_cast<size_t>(numberColumnsFile)) 3435 3431 throw("Error in fread"); 3436 3432 CoinMemcpyN(temp, numberColumns, dualColumnSolution); … … 3507 3503 double * primalRowSolution = lpSolver->primalRowSolution(); 3508 3504 nWrite = fwrite(primalRowSolution, sizeof(double), numberRows, fp); 3509 if (nWrite != numberRows)3505 if (nWrite != static_cast<size_t>(numberRows)) 3510 3506 throw("Error in fwrite"); 3511 3507 nWrite = fwrite(dualRowSolution, sizeof(double), numberRows, fp); 3512 if (nWrite != numberRows)3508 if (nWrite != static_cast<size_t>(numberRows)) 3513 3509 throw("Error in fwrite"); 3514 3510 double * dualColumnSolution = lpSolver->dualColumnSolution(); 3515 3511 double * primalColumnSolution = lpSolver->primalColumnSolution(); 3516 3512 nWrite = fwrite(primalColumnSolution, sizeof(double), numberColumns, fp); 3517 if (nWrite != numberColumns)3513 if (nWrite != static_cast<size_t>(numberColumns)) 3518 3514 throw("Error in fwrite"); 3519 3515 nWrite = fwrite(dualColumnSolution, sizeof(double), numberColumns, fp); 3520 if (nWrite != numberColumns)3516 if (nWrite != static_cast<size_t>(numberColumns)) 3521 3517 throw("Error in fwrite"); 3522 3518 fclose(fp); -
trunk/Clp/src/ClpCholeskyDense.cpp
r1723 r1726 806 806 double dropValue = thisStruct->doubleParameters_[0]; 807 807 int firstPositive = thisStruct->integerParameters_[0]; 808 int rowOffset = diagonal - thisStruct->diagonal_;808 int rowOffset = static_cast<int>(diagonal - thisStruct->diagonal_); 809 809 int i, j, k; 810 810 CoinWorkDouble t00, temp1; -
trunk/Clp/src/ClpDynamicMatrix.cpp
r1678 r1726 94 94 lowerSet_ = ClpCopyOfArray(rhs.lowerSet_, numberSets_); 95 95 upperSet_ = ClpCopyOfArray(rhs.upperSet_, numberSets_); 96 status_ = ClpCopyOfArray(rhs.status_, 2*numberSets_+4*sizeof(int));96 status_ = ClpCopyOfArray(rhs.status_, static_cast<int>(2*numberSets_+4*sizeof(int))); 97 97 model_ = rhs.model_; 98 98 sumDualInfeasibilities_ = rhs. sumDualInfeasibilities_; … … 263 263 keyVariable_ = new int[numberSets_]; 264 264 if (status) { 265 status_ = ClpCopyOfArray(status, 2*numberSets_+4*sizeof(int));265 status_ = ClpCopyOfArray(status, static_cast<int>(2*numberSets_+4*sizeof(int))); 266 266 assert (dynamicStatus); 267 267 dynamicStatus_ = ClpCopyOfArray(dynamicStatus, 2*numberGubColumns_); … … 360 360 lowerSet_ = ClpCopyOfArray(rhs.lowerSet_, numberSets_); 361 361 upperSet_ = ClpCopyOfArray(rhs.upperSet_, numberSets_); 362 status_ = ClpCopyOfArray(rhs.status_, 2*numberSets_+4*sizeof(int));362 status_ = ClpCopyOfArray(rhs.status_, static_cast<int>(2*numberSets_+4*sizeof(int))); 363 363 model_ = rhs.model_; 364 364 sumDualInfeasibilities_ = rhs. sumDualInfeasibilities_; -
trunk/Clp/src/ClpMain.cpp
r1724 r1726 286 286 int numberQuery = 0; 287 287 if (field != "?" && field != "???") { 288 int length = field.length();289 int i;288 size_t length = field.length(); 289 size_t i; 290 290 for (i = length - 1; i > 0; i--) { 291 291 if (field[i] == '?') … … 949 949 { 950 950 const char * c_name = field.c_str(); 951 int length = strlen(c_name);951 size_t length = strlen(c_name); 952 952 if (length > 3 && !strncmp(c_name + length - 3, ".lp", 3)) 953 953 gmpl = -1; // .lp … … 966 966 if (absolutePath) { 967 967 fileName = field; 968 int length = field.size();969 int percent = field.find('%');968 size_t length = field.size(); 969 size_t percent = field.find('%'); 970 970 if (percent < length && percent > 0) { 971 971 gmpl = 1; … … 989 989 fileName = directory + field; 990 990 // See if gmpl (model & data) - or even lp file 991 int length = field.size();992 int percent = field.find('%');991 size_t length = field.size(); 992 size_t percent = field.find('%'); 993 993 if (percent < length && percent > 0) { 994 994 gmpl = 1; … … 1552 1552 std::string name = CoinReadGetString(argc, argv); 1553 1553 if (name != "EOL") { 1554 int length = name.length();1555 if ( name[length-1] == dirsep) {1554 size_t length = name.length(); 1555 if (length > 0 && name[length-1] == dirsep) { 1556 1556 directory = name; 1557 1557 } else { … … 1567 1567 std::string name = CoinReadGetString(argc, argv); 1568 1568 if (name != "EOL") { 1569 int length = name.length();1570 if ( name[length-1] == dirsep) {1569 size_t length = name.length(); 1570 if (length > 0 && name[length-1] == dirsep) { 1571 1571 dirSample = name; 1572 1572 } else { … … 1582 1582 std::string name = CoinReadGetString(argc, argv); 1583 1583 if (name != "EOL") { 1584 int length = name.length();1585 if ( name[length-1] == dirsep) {1584 size_t length = name.length(); 1585 if (length > 0 && name[length-1] == dirsep) { 1586 1586 dirNetlib = name; 1587 1587 } else { … … 1597 1597 std::string name = CoinReadGetString(argc, argv); 1598 1598 if (name != "EOL") { 1599 int length = name.length();1600 if ( name[length-1] == dirsep) {1599 size_t length = name.length(); 1600 if (length > 0 && name[length-1] == dirsep) { 1601 1601 dirMiplib = name; 1602 1602 } else { … … 1945 1945 const char * pMask2 = printMask.c_str(); 1946 1946 char pMask[100]; 1947 int iChar; 1948 int lengthMask = strlen(pMask2); 1947 size_t lengthMask = strlen(pMask2); 1949 1948 assert (lengthMask < 100); 1950 1949 if (*pMask2 == '"') { … … 1967 1966 strcpy(pMask, pMask2); 1968 1967 } 1969 if (lengthMask > lengthName) {1968 if (lengthMask > static_cast<size_t>(lengthName)) { 1970 1969 printf("mask %s too long - skipping\n", pMask); 1971 1970 break; 1972 1971 } 1973 1972 maxMasks = 1; 1974 for ( iChar = 0; iChar < lengthMask; iChar++) {1973 for (size_t iChar = 0; iChar < lengthMask; iChar++) { 1975 1974 if (pMask[iChar] == '*') { 1976 1975 nAst++; … … 1995 1994 char * ast = strchr(oldMask, '*'); 1996 1995 assert (ast); 1997 int length = strlen(oldMask) - 1;1998 int nBefore = ast - oldMask;1999 int nAfter = length - nBefore;1996 size_t length = strlen(oldMask) - 1; 1997 size_t nBefore = ast - oldMask; 1998 size_t nAfter = length - nBefore; 2000 1999 // and add null 2001 2000 nAfter++; 2002 for ( int i = 0; i <= lengthName - length; i++) {2001 for (size_t i = 0; i <= lengthName - length; i++) { 2003 2002 char * maskOut = newMasks[nEntries]; 2004 CoinMemcpyN(oldMask, nBefore, maskOut);2005 for ( int k = 0; k < i; k++)2003 CoinMemcpyN(oldMask, static_cast<int>(nBefore), maskOut); 2004 for (size_t k = 0; k < i; k++) 2006 2005 maskOut[k+nBefore] = '?'; 2007 CoinMemcpyN(ast + 1, nAfter, maskOut + nBefore + i);2006 CoinMemcpyN(ast + 1, static_cast<int>(nAfter), maskOut + nBefore + i); 2008 2007 nEntries++; 2009 2008 assert (nEntries <= maxMasks); … … 2018 2017 for (i = 0; i < nEntries; i++) { 2019 2018 char * maskThis = masks[i]; 2020 int length = strlen(maskThis);2021 while ( maskThis[length-1] == ' ')2019 size_t length = strlen(maskThis); 2020 while (length > 0 && maskThis[length-1] == ' ') 2022 2021 length--; 2023 2022 maskThis[length] = '\0'; 2024 sort[i] = length;2023 sort[i] = static_cast<int>(length); 2025 2024 } 2026 2025 CoinSort_2(sort, sort + nEntries, masks); … … 2194 2193 if (lengthName) { 2195 2194 const char * name = rowNames[iRow].c_str(); 2196 int n = strlen(name);2197 int i;2195 size_t n = strlen(name); 2196 size_t i; 2198 2197 for (i = 0; i < n; i++) 2199 2198 fprintf(fp, "%c", name[i]); 2200 for (; i < lengthPrint; i++)2199 for (; i < static_cast<size_t>(lengthPrint); i++) 2201 2200 fprintf(fp, " "); 2202 2201 } … … 2232 2231 if (lengthName) { 2233 2232 const char * name = columnNames[iColumn].c_str(); 2234 int n = strlen(name);2235 int i;2233 size_t n = strlen(name); 2234 size_t i; 2236 2235 for (i = 0; i < n; i++) 2237 2236 fprintf(fp, "%c", name[i]); 2238 for (; i < lengthPrint; i++)2237 for (; i < static_cast<size_t>(lengthPrint); i++) 2239 2238 fprintf(fp, " "); 2240 2239 } … … 3290 3289 // back to char as I am old fashioned 3291 3290 const char * checkC = check.c_str(); 3292 int length = strlen(checkC);3291 size_t length = strlen(checkC); 3293 3292 while (checkC[length-1] == ' ') 3294 3293 length--; 3295 3294 for (int i = starts[length]; i < starts[length+1]; i++) { 3296 3295 char * thisMask = masks[i]; 3297 int k;3296 size_t k; 3298 3297 for ( k = 0; k < length; k++) { 3299 3298 if (thisMask[k] != '?' && thisMask[k] != checkC[k]) -
trunk/Clp/src/ClpModel.cpp
r1723 r1726 3290 3290 } 3291 3291 #endif 3292 int size = rowNames_.size();3292 int size = static_cast<int>(rowNames_.size()); 3293 3293 if (size > iRow) { 3294 3294 return rowNames_[iRow]; … … 3310 3310 #endif 3311 3311 unsigned int maxLength = lengthNames_; 3312 int size = rowNames_.size();3312 size_t size = static_cast<int>(rowNames_.size()); 3313 3313 if (size <= iRow) 3314 3314 rowNames_.resize(iRow + 1); … … 3327 3327 } 3328 3328 #endif 3329 int size = columnNames_.size();3329 int size = static_cast<int>(columnNames_.size()); 3330 3330 if (size > iColumn) { 3331 3331 return columnNames_[iColumn]; … … 3347 3347 #endif 3348 3348 unsigned int maxLength = lengthNames_; 3349 int size = columnNames_.size();3349 int size = static_cast<int>(columnNames_.size()); 3350 3350 if (size <= iColumn) 3351 3351 columnNames_.resize(iColumn + 1); … … 3360 3360 { 3361 3361 unsigned int maxLength = lengthNames_; 3362 int size = rowNames_.size();3362 int size = static_cast<int>(rowNames_.size()); 3363 3363 if (size != numberRows_) 3364 3364 rowNames_.resize(numberRows_); … … 3376 3376 { 3377 3377 unsigned int maxLength = lengthNames_; 3378 int size = columnNames_.size();3378 int size = static_cast<int>(columnNames_.size()); 3379 3379 if (size != numberColumns_) 3380 3380 columnNames_.resize(numberColumns_); … … 3392 3392 { 3393 3393 unsigned int maxLength = lengthNames_; 3394 int size = rowNames_.size();3394 int size = static_cast<int>(rowNames_.size()); 3395 3395 if (size != numberRows_) 3396 3396 rowNames_.resize(numberRows_); … … 3415 3415 { 3416 3416 unsigned int maxLength = lengthNames_; 3417 int size = columnNames_.size();3417 int size = static_cast<int>(columnNames_.size()); 3418 3418 if (size != numberColumns_) 3419 3419 columnNames_.resize(numberColumns_); … … 3650 3650 if (lengthNames()) { 3651 3651 rowNames = new char * [numberRows_+1]; 3652 int numberNames = rowNames_.size();3652 int numberNames = static_cast<int>(rowNames_.size()); 3653 3653 numberNames = CoinMin(numberRows_, numberNames); 3654 3654 int iRow; … … 3690 3690 if (lengthNames()) { 3691 3691 columnNames = new char * [numberColumns_]; 3692 int numberNames = columnNames_.size();3692 int numberNames = static_cast<int>(columnNames_.size()); 3693 3693 numberNames = CoinMin(numberColumns_, numberNames); 3694 3694 int iColumn; … … 3887 3887 char temp[30]; 3888 3888 strcpy(temp, rowName(i).c_str()); 3889 int length = strlen(temp);3890 for ( int j = 0; j < length; j++) {3889 size_t length = strlen(temp); 3890 for (size_t j = 0; j < length; j++) { 3891 3891 if (temp[j] == '-') 3892 3892 temp[j] = '_'; … … 3897 3897 char temp[30]; 3898 3898 strcpy(temp, columnName(i).c_str()); 3899 int length = strlen(temp);3900 for ( int j = 0; j < length; j++) {3899 size_t length = strlen(temp); 3900 for (size_t j = 0; j < length; j++) { 3901 3901 if (temp[j] == '-') 3902 3902 temp[j] = '_'; -
trunk/Clp/src/ClpPackedMatrix.cpp
r1723 r1726 4071 4071 #ifndef COIN_BIG_INDEX 4072 4072 printf("Out of range %d %d %d %g\n", iColumn, j, row[j], elementByColumn[j]); 4073 #elif COIN_BIG_INDEX==0 4074 printf("Out of range %d %d %d %g\n", iColumn, j, row[j], elementByColumn[j]); 4073 4075 #elif COIN_BIG_INDEX==1 4074 4076 printf("Out of range %d %ld %d %g\n", iColumn, j, row[j], elementByColumn[j]); … … 4119 4121 if (iRow < 0 || iRow >= numberRows) { 4120 4122 #ifndef COIN_BIG_INDEX 4123 printf("Out of range %d %d %d %g\n", iColumn, j, row[j], elementByColumn[j]); 4124 #elif COIN_BIG_INDEX==0 4121 4125 printf("Out of range %d %d %d %g\n", iColumn, j, row[j], elementByColumn[j]); 4122 4126 #elif COIN_BIG_INDEX==1 -
trunk/Clp/src/ClpPredictorCorrector.cpp
r1723 r1726 818 818 CoinWorkDouble nextCenterGap = 0.0; 819 819 int numberGoodTries = 0; 820 #ifdef COIN_DETAIL 820 821 CoinWorkDouble originalDualStep = actualDualStep_; 821 822 CoinWorkDouble originalPrimalStep = actualPrimalStep_; 823 #endif 822 824 if (actualDualStep_ > 0.9 && actualPrimalStep_ > 0.9) 823 825 goodMove = false; // don't bother -
trunk/Clp/src/ClpSimplex.cpp
r1723 r1726 6216 6216 int outDoubleArray(double * array, int length, FILE * fp) 6217 6217 { 6218 int numberWritten;6218 size_t numberWritten; 6219 6219 if (array && length) { 6220 6220 numberWritten = fwrite(&length, sizeof(int), 1, fp); … … 6222 6222 return 1; 6223 6223 numberWritten = fwrite(array, sizeof(double), length, fp); 6224 if (numberWritten != length)6224 if (numberWritten != static_cast<size_t>(length)) 6225 6225 return 1; 6226 6226 } else { … … 6239 6239 if (fp) { 6240 6240 Clp_scalars scalars; 6241 CoinBigIndexnumberWritten;6241 size_t numberWritten; 6242 6242 // Fill in scalars 6243 6243 scalars.optimizationDirection = optimizationDirection_; … … 6273 6273 if (numberWritten != 1) 6274 6274 return 1; 6275 CoinBigIndexlength;6275 size_t length; 6276 6276 #ifndef CLP_NO_STD 6277 6277 int i; … … 6351 6351 } 6352 6352 numberWritten = fwrite(array, lengthNames_ + 1, numberRows_, fp); 6353 if (numberWritten != numberRows_)6353 if (numberWritten != static_cast<size_t>(numberRows_)) 6354 6354 return 1; 6355 6355 put = array; … … 6361 6361 } 6362 6362 numberWritten = fwrite(array, lengthNames_ + 1, numberColumns_, fp); 6363 if (numberWritten != numberColumns_)6363 if (numberWritten != static_cast<size_t>(numberColumns_)) 6364 6364 return 1; 6365 6365 delete [] array; … … 6371 6371 numberWritten = fwrite(&marker, sizeof(int), 1, fp); 6372 6372 numberWritten = fwrite(integerType_, 1, numberColumns_, fp); 6373 if (numberWritten != numberColumns_)6373 if (numberWritten != static_cast<size_t>(numberColumns_)) 6374 6374 return 1; 6375 6375 } else { … … 6397 6397 numberWritten = fwrite(matrix_->getVectorStarts(), 6398 6398 sizeof(int), numberColumns_ + 1, fp); 6399 if (numberWritten != numberColumns_+ 1)6399 if (numberWritten != static_cast<size_t>(numberColumns_) + 1) 6400 6400 return 1; 6401 6401 numberWritten = fwrite(matrix_->getVectorLengths(), 6402 6402 sizeof(int), numberColumns_, fp); 6403 if (numberWritten != numberColumns_)6403 if (numberWritten != static_cast<size_t>(numberColumns_)) 6404 6404 return 1; 6405 6405 // finished … … 6413 6413 int inDoubleArray(double * &array, int length, FILE * fp) 6414 6414 { 6415 int numberRead;6415 size_t numberRead; 6416 6416 int length2; 6417 6417 numberRead = fread(&length2, sizeof(int), 1, fp); … … 6424 6424 array = new double[length]; 6425 6425 numberRead = fread(array, sizeof(double), length, fp); 6426 if (numberRead != length)6426 if (numberRead != static_cast<size_t>(length)) 6427 6427 return 1; 6428 6428 } … … 6452 6452 factorization_->sparseThreshold(1); 6453 6453 Clp_scalars scalars; 6454 CoinBigIndexnumberRead;6454 size_t numberRead; 6455 6455 6456 6456 // get scalars … … 6551 6551 status_ = new char unsigned[length]; 6552 6552 numberRead = fread(status_, sizeof(char), length, fp); 6553 if (numberRead != length)6553 if (numberRead != static_cast<size_t>(length)) 6554 6554 return 1; 6555 6555 } … … 6560 6560 char * get = array; 6561 6561 numberRead = fread(array, lengthNames_ + 1, numberRows_, fp); 6562 if (numberRead != numberRows_)6562 if (numberRead != static_cast<size_t>(numberRows_)) 6563 6563 return 1; 6564 6564 rowNames_ = std::vector<std::string> (); … … 6570 6570 get = array; 6571 6571 numberRead = fread(array, lengthNames_ + 1, numberColumns_, fp); 6572 if (numberRead != numberColumns_)6572 if (numberRead != static_cast<size_t>(numberColumns_)) 6573 6573 return 1; 6574 6574 columnNames_ = std::vector<std::string> (); … … 6592 6592 integerType_ = new char [numberColumns_]; 6593 6593 numberRead = fread(integerType_, 1, numberColumns_, fp); 6594 if (numberRead != numberColumns_)6594 if (numberRead != static_cast<size_t>(numberColumns_)) 6595 6595 return 1; 6596 6596 } else { … … 6646 6646 int * lengths = new int[numberColumns_]; 6647 6647 numberRead = fread(elements, sizeof(double), length, fp); 6648 if (numberRead != length)6648 if (numberRead != static_cast<size_t>(length)) 6649 6649 return 1; 6650 6650 numberRead = fread(indices, sizeof(int), length, fp); 6651 if (numberRead != length)6651 if (numberRead != static_cast<size_t>(length)) 6652 6652 return 1; 6653 6653 numberRead = fread(starts, sizeof(int), numberColumns_ + 1, fp); 6654 if (numberRead != numberColumns_+ 1)6654 if (numberRead != static_cast<size_t>(numberColumns_) + 1) 6655 6655 return 1; 6656 6656 numberRead = fread(lengths, sizeof(int), numberColumns_, fp); 6657 if (numberRead != numberColumns_)6657 if (numberRead != static_cast<size_t>(numberColumns_)) 6658 6658 return 1; 6659 6659 // assign matrix -
trunk/Clp/src/MyMessageHandler.cpp
r1665 r1726 5 5 6 6 #if defined(_MSC_VER) 7 #pragma warning(disable:4786) 7 // move into CoinPragma.hpp ? 8 8 #pragma warning(disable:4503) 9 9 #endif … … 11 11 #include <cstdio> 12 12 13 #include "CoinPragma.hpp" 13 14 #include "ClpSimplex.hpp" 14 15 #include "ClpNonLinearCost.hpp" … … 128 129 129 130 // Want maximum of 10 solutions, so if more then 10 get rid of oldest 130 int numExtremePointsSaved = feasibleExtremePoints_.size();131 size_t numExtremePointsSaved = feasibleExtremePoints_.size(); 131 132 if ( numExtremePointsSaved >= 10 ) { 132 133 feasibleExtremePoints_.pop_back(); 133 assert( feasibleExtremePoints_.size() == 134 static_cast<unsigned int> (numExtremePointsSaved) - 1 ); 134 assert( feasibleExtremePoints_.size() == numExtremePointsSaved - 1 ); 135 135 }; 136 136 -
trunk/Clp/src/unitTest.cpp
r1722 r1726 1356 1356 // Write saved solutions 1357 1357 int nc = model.getNumCols(); 1358 int s;1358 size_t s; 1359 1359 std::deque<StdVectorDouble> fep = messageHandler.getFeasibleExtremePoints(); 1360 int numSavedSolutions = fep.size();1360 size_t numSavedSolutions = fep.size(); 1361 1361 for ( s = 0; s < numSavedSolutions; ++s ) { 1362 1362 const StdVectorDouble & solnVec = fep[s];
Note: See TracChangeset
for help on using the changeset viewer.