Changeset 1404 for stable

Timestamp:

Jul 28, 2009 8:25:35 AM (12 years ago)

Author:

tkr

Message:

Merging r1375:1393 from stable/BSP to stable/1.10

Location:

stable/1.10/Clp

Files:

• . (modified) (1 prop)
• src/CbcOrClpParam.cpp (modified) (7 diffs)
• src/ClpCholeskyDense.cpp (modified) (2 diffs)
• src/ClpMain.cpp (modified) (16 diffs)
• src/ClpMatrixBase.hpp (modified) (5 diffs)
• src/ClpModel.cpp (modified) (14 diffs)
• src/ClpSimplex.cpp (modified) (18 diffs)
• src/ClpSimplexDual.cpp (modified) (2 diffs)
• src/Clp_C_Interface.cpp (modified) (3 diffs)
• src/Makefile.am (modified) (2 diffs)
• src/Makefile.in (modified) (2 diffs)
• src/MyMessageHandler.cpp (modified) (1 diff)
• src/unitTest.cpp (modified) (3 diffs)

stable/1.10/Clp/src/CbcOrClpParam.cpp

@@ -232 +232 @@
 {
   std::string::size_type  shriekPos = name_.find('!');
-  lengthName_ = name_.length();
+  lengthName_ = (unsigned int)name_.length();
   if ( shriekPos==std::string::npos ) {
     //does not contain '!'
     lengthMatch_= lengthName_;
   } else {
-    lengthMatch_=shriekPos;
+    lengthMatch_=(unsigned int)shriekPos;
     name_ = name_.substr(0,shriekPos)+name_.substr(shriekPos+1);
     lengthName_--;
@@ -285 +285 @@
 CbcOrClpParam::parameterOption ( std::string check ) const
 {
-  int numberItems = definedKeyWords_.size();
+  size_t numberItems = definedKeyWords_.size();
   if (!numberItems) {
     return -1;
   } else {
-    int whichItem=0;
+    size_t whichItem=0;
     unsigned int it;
     for (it=0;it<definedKeyWords_.size();it++) {
       std::string thisOne = definedKeyWords_[it];
-      std::string::size_type  shriekPos = thisOne.find('!');
-      unsigned int length1 = thisOne.length();
-      unsigned int length2 = length1;
+      std::string::size_type shriekPos = thisOne.find('!');
+      std::string::size_type length1 = thisOne.length();
+      std::string::size_type length2 = length1;
       if ( shriekPos!=std::string::npos ) {
         //contains '!'
@@ -304 +304 @@
       }
       if (check.length()<=length1&&length2<=check.length()) {
-        unsigned int i;
+        std::string::size_type i;
         for (i=0;i<check.length();i++) {
           if (tolower(thisOne[i])!=tolower(check[i])) 
@@ -319 +319 @@
     }
     if (whichItem<numberItems)
-      return whichItem;
+      return (int)whichItem;
     else
       return -1;
@@ -364 +364 @@
 void CoinReadPrintit(const char * input)
 {
-  int length =strlen(input);
+  size_t length =strlen(input);
   char temp[101];
-  int i;
+  size_t i;
   int n=0;
   for (i=0;i<length;i++) {
@@ -1156 +1156 @@
     afterEquals = "";
   }
-  int value=0;
+  size_t value=0;
   //std::cout<<field<<std::endl;
   if (field!="EOL") {
@@ -1172 +1172 @@
     *valid=2;
   }
-  return value;
+  return (int)value;
 }
 double

stable/1.10/Clp/src/ClpCholeskyDense.cpp

@@ -780 +780 @@
   double dropValue = doubleParameters_[10];
   int firstPositive=integerParameters_[34];
-  int rowOffset=diagonal-diagonal_;
+  size_t rowOffset=diagonal-diagonal_;
   int numberDropped=0;
   int i, j, k;
@@ -795 +795 @@
     bool dropColumn=false;
     longDouble useT00=t00;
-    if (j+rowOffset<firstPositive) {
+    if ((int)(j+rowOffset)<firstPositive) {
       // must be negative
       if (t00<=-dropValue) {

stable/1.10/Clp/src/ClpMain.cpp

@@ -239 +239 @@
       int numberQuery=0;
       if (field!="?"&&field!="???") {
-        int length = field.length();
-        int i;
+        size_t length = field.length();
+        long i;
         for (i=length-1;i>0;i--) {
           if (field[i]=='?') 
@@ -880 +880 @@
                 {
                   const char * c_name = field.c_str();
-                  int length = strlen(c_name);
+                  size_t length = strlen(c_name);
                   if (length>3&&!strncmp(c_name+length-3,".lp",3))
                     gmpl=-1; // .lp
@@ -909 +909 @@
                   fileName = directory+field;
                   // See if gmpl (model & data) - or even lp file
-                  int length = field.size();
-                  int percent = field.find('%');
+                  size_t length = field.size();
+                  size_t percent = field.find('%');
                   if (percent<length&&percent>0) {
                     gmpl=1;
                     fileName = directory+field.substr(0,percent);
                     gmplData = directory+field.substr(percent+1);
-                    if (percent<length-1)
+                    if (percent+1<length)
                       gmpl=2; // two files
                     printf("GMPL model file %s and data file %s\n",
@@ -1432 +1432 @@
               std::string name = CoinReadGetString(argc,argv);
               if (name!="EOL") {
-                int length=name.length();
+                size_t length=name.length();
                 if (name[length-1]==dirsep) {
                   directory = name;
@@ -1448 +1448 @@
               std::string name = CoinReadGetString(argc,argv);
               if (name!="EOL") {
-                int length=name.length();
+                size_t length=name.length();
                 if (name[length-1]==dirsep) {
                   dirSample = name;
@@ -1464 +1464 @@
               std::string name = CoinReadGetString(argc,argv);
               if (name!="EOL") {
-                int length=name.length();
+                size_t length=name.length();
                 if (name[length-1]==dirsep) {
                   dirNetlib = name;
@@ -1480 +1480 @@
               std::string name = CoinReadGetString(argc,argv);
               if (name!="EOL") {
-                int length=name.length();
+                size_t length=name.length();
                 if (name[length-1]==dirsep) {
                   dirMiplib = name;
@@ -1689 +1689 @@
                 int iRow;
                 int numberRows=models[iModel].numberRows();
-                int lengthName = models[iModel].lengthNames(); // 0 if no names
+                size_t lengthName = models[iModel].lengthNames(); // 0 if no names
                 // in general I don't want to pass around massive
                 // amounts of data but seems simpler here
@@ -1704 +1704 @@
                 double primalTolerance = models[iModel].primalTolerance();
                 char format[6];
-                sprintf(format,"%%-%ds",CoinMax(lengthName,8));
+                sprintf(format,"%%-%ds",(int)CoinMax(lengthName,(size_t)8));
                 bool doMask = (printMask!=""&&lengthName);
                 int * maskStarts=NULL;
-                int maxMasks=0;
+                size_t maxMasks=0;
                 char ** masks =NULL;
                 if (doMask) {
@@ -1713 +1713 @@
                   const char * pMask2 = printMask.c_str();
                   char pMask[100];
-                  int iChar;
-                  int lengthMask = strlen(pMask2);
+                  size_t iChar;
+                  size_t lengthMask = strlen(pMask2);
                   assert (lengthMask<100);
                   if (*pMask2=='"') {
@@ -1746 +1746 @@
                     }
                   }
-                  int nEntries = 1;
+                  size_t nEntries = 1;
                   maskStarts = new int[lengthName+2];
                   masks = new char * [maxMasks];
                   char ** newMasks = new char * [maxMasks];
-                  int i;
+                  size_t i;
                   for (i=0;i<maxMasks;i++) {
                     masks[i] = new char[lengthName+1];
@@ -1757 +1757 @@
                   strcpy(masks[0],pMask);
                   for (int iAst=0;iAst<nAst;iAst++) {
-                    int nOldEntries = nEntries;
+                    size_t nOldEntries = nEntries;
                     nEntries=0;
-                    for (int iEntry = 0;iEntry<nOldEntries;iEntry++) {
+                    for (size_t iEntry = 0;iEntry<nOldEntries;iEntry++) {
                       char * oldMask = masks[iEntry];
                       char * ast = strchr(oldMask,'*');
                       assert (ast);
-                      int length = strlen(oldMask)-1;
-                      int nBefore = ast-oldMask;
-                      int nAfter = length-nBefore;
+                      size_t length = strlen(oldMask)-1;
+                      size_t nBefore = ast-oldMask;
+                      size_t nAfter = length-nBefore;
                       // and add null
                       nAfter++;
-                      for (int i=0;i<=lengthName-length;i++) {
+                      for (size_t i=0;i<=lengthName-length;i++) {
                         char * maskOut = newMasks[nEntries];
    CoinMemcpyN(oldMask,nBefore,maskOut);
-                        for (int k=0;k<i;k++) 
+                        for (size_t k=0;k<i;k++) 
                           maskOut[k+nBefore]='?';
    CoinMemcpyN(ast+1,nAfter,maskOut+nBefore+i);
@@ -1783 +1783 @@
                   }
                   // Now extend and sort
-                  int * sort = new int[nEntries];
+                  size_t* sort = new size_t[nEntries];
                   for (i=0;i<nEntries;i++) {
                     char * maskThis = masks[i];
-                    int length = strlen(maskThis);
+                    size_t length = strlen(maskThis);
                     while (maskThis[length-1]==' ')
                       length--;
@@ -1793 +1793 @@
                   }
                   CoinSort_2(sort,sort+nEntries,masks);
-                  int lastLength=-1;
+                  long lastLength=-1;
                   for (i=0;i<nEntries;i++) {
-                    int length = sort[i];
-                    while (length>lastLength) 
-                      maskStarts[++lastLength] = i;
-                  }
-                  maskStarts[++lastLength]=nEntries;
+                    size_t length = sort[i];
+                    while ((long)length>lastLength) 
+                      maskStarts[++lastLength] = (int)i;
+                  }
+                  maskStarts[++lastLength]=(int)nEntries;
                   delete [] sort;
                   for (i=0;i<maxMasks;i++)
@@ -1863 +1863 @@
                 if (masks) {
                   delete [] maskStarts;
-                  for (int i=0;i<maxMasks;i++)
+                  for (size_t i=0;i<maxMasks;i++)
                     delete [] masks[i];
                   delete [] masks;
@@ -2889 +2889 @@
   // back to char as I am old fashioned
   const char * checkC = check.c_str();
-  int length = strlen(checkC);
+  size_t length = strlen(checkC);
   while (checkC[length-1]==' ')
     length--;
   for (int i=starts[length];i<starts[length+1];i++) {
     char * thisMask = masks[i];
-    int k;
+    size_t k;
     for ( k=0;k<length;k++) {
       if (thisMask[k]!='?'&&thisMask[k]!=checkC[k]) 

stable/1.10/Clp/src/ClpMatrixBase.hpp

@@ -99 +99 @@
       default does not allow scaling
       returns non-zero if no scaling done */
-  virtual int scale(ClpModel * model, const ClpSimplex * baseModel=NULL) const 
+  virtual int scale(ClpModel * , const ClpSimplex * =NULL) const 
   { return 1;}
   /** Scales rowCopy if column copy scaled
       Only called if scales already exist */
-  virtual void scaleRowCopy(ClpModel * model) const 
+  virtual void scaleRowCopy(ClpModel * ) const 
   { }
   /// Returns true if can create row copy
@@ -111 +111 @@
       Only called if scales already exist.
       Up to user to delete */
-  inline virtual ClpMatrixBase * scaledColumnCopy(ClpModel * model) const 
+  inline virtual ClpMatrixBase * scaledColumnCopy(ClpModel * ) const 
   { return this->clone();}
   
@@ -124 +124 @@
       8 - report on large and small
   */
-  virtual bool allElementsInRange(ClpModel * model,
-                                  double smallest, double largest,
-                                  int check=15)
+  virtual bool allElementsInRange(ClpModel * ,
+                                  double, double,
+                                  int =15)
   { return true;}
   /** Set the dimensions of the matrix. In effect, append new empty
@@ -155 +155 @@
       Returns non-zero if any changes.
   */
-  virtual int refresh(ClpSimplex * model)
+  virtual int refresh(ClpSimplex * )
   { return 0;}
   
@@ -295 +295 @@
   /** Returns true if can combine transposeTimes and subsetTransposeTimes
       and if it would be faster */
-  virtual bool canCombine(const ClpSimplex * model,
-                          const CoinIndexedVector * pi) const {return false;}
+  virtual bool canCombine(const ClpSimplex * ,
+                          const CoinIndexedVector * ) const {return false;}
   /// Updates two arrays for steepest and does devex weights (need not be coded)
   virtual void transposeTimes2(const ClpSimplex * model,

stable/1.10/Clp/src/ClpModel.cpp

@@ -3275 +3275 @@
   }
 #endif
-  int size = rowNames_.size();
-  if (size>iRow) {
+  size_t size = rowNames_.size();
+  if (size>(size_t)iRow) {
     return rowNames_[iRow];
   } else {
@@ -3295 +3295 @@
 #endif
   unsigned int maxLength=lengthNames_;
-  int size = rowNames_.size();
-  if (size<=iRow)
+  size_t size = rowNames_.size();
+  if (size<=(size_t)iRow)
     rowNames_.resize(iRow+1);
   rowNames_[iRow]= name;
@@ -3312 +3312 @@
   }
 #endif
-  int size = columnNames_.size();
-  if (size>iColumn) {
+  size_t size = columnNames_.size();
+  if (size>(size_t)iColumn) {
     return columnNames_[iColumn];
   } else {
@@ -3332 +3332 @@
 #endif
   unsigned int maxLength=lengthNames_;
-  int size = columnNames_.size();
-  if (size<=iColumn)
+  size_t size = columnNames_.size();
+  if (size<=(size_t)iColumn)
     columnNames_.resize(iColumn+1);
   columnNames_[iColumn]= name;
@@ -3345 +3345 @@
 {
   unsigned int maxLength=lengthNames_;
-  int size = rowNames_.size();
-  if (size!=numberRows_)
+  size_t size = rowNames_.size();
+  if (size!=(size_t)numberRows_)
     rowNames_.resize(numberRows_);
   int iRow;
@@ -3361 +3361 @@
 {
   unsigned int maxLength=lengthNames_;
-  int size = columnNames_.size();
-  if (size!=numberColumns_)
+  size_t size = columnNames_.size();
+  if (size!=(size_t)numberColumns_)
     columnNames_.resize(numberColumns_);
   int iColumn;
@@ -3377 +3377 @@
 {
   unsigned int maxLength=lengthNames_;
-  int size = rowNames_.size();
-  if (size!=numberRows_)
+  size_t size = rowNames_.size();
+  if (size!=(size_t)numberRows_)
     rowNames_.resize(numberRows_);
   int iRow;
@@ -3400 +3400 @@
 {
   unsigned int maxLength=lengthNames_;
-  int size = columnNames_.size();
-  if (size!=numberColumns_)
+  size_t size = columnNames_.size();
+  if (size!=(size_t)numberColumns_)
     columnNames_.resize(numberColumns_);
   int iColumn;
@@ -3635 +3635 @@
   if (lengthNames()) {
     rowNames = new char * [numberRows_+1];
-    int numberNames = rowNames_.size();
-    numberNames = CoinMin(numberRows_,numberNames);
-    int iRow;
+    size_t numberNames = rowNames_.size();
+    numberNames = CoinMin((size_t)numberRows_,numberNames);
+    size_t iRow;
     for (iRow=0;iRow<numberNames;iRow++) {
       rowNames[iRow] = 
-        CoinStrdup(rowName(iRow).c_str());
+        CoinStrdup(rowName((int)iRow).c_str());
 #ifdef STRIPBLANKS
       char * xx = rowNames[iRow];
@@ -3654 +3654 @@
     }
     char name[9];
-    for ( ;iRow<numberRows_;iRow++) {
-      sprintf(name,"R%7.7d",iRow);
+    for ( ;iRow<(size_t)numberRows_;iRow++) {
+      sprintf(name,"R%7.7d",(int)iRow);
       rowNames[iRow]=CoinStrdup(name);
     }
@@ -3669 +3669 @@
   if (lengthNames()) {
     columnNames = new char * [numberColumns_];
-    int numberNames = columnNames_.size();
-    numberNames = CoinMin(numberColumns_,numberNames);
-    int iColumn;
+    size_t numberNames = columnNames_.size();
+    numberNames = CoinMin((size_t)numberColumns_,numberNames);
+    size_t iColumn;
     for (iColumn=0;iColumn<numberNames;iColumn++) {
       columnNames[iColumn] = 
-        CoinStrdup(columnName(iColumn).c_str());
+        CoinStrdup(columnName((int)iColumn).c_str());
 #ifdef STRIPBLANKS
       char * xx = columnNames[iColumn];
@@ -3688 +3688 @@
     }
     char name[9];
-    for ( ;iColumn<numberColumns_;iColumn++) {
-      sprintf(name,"C%7.7d",iColumn);
+    for ( ;iColumn<(size_t)numberColumns_;iColumn++) {
+      sprintf(name,"C%7.7d",(int)iColumn);
       columnNames[iColumn]=CoinStrdup(name);
     }
@@ -3857 +3857 @@
     char temp[30];
     strcpy(temp,rowName(i).c_str());
-    int length = strlen(temp);
-    for (int j=0;j<length;j++) {
+    size_t length = strlen(temp);
+    for (size_t j=0;j<length;j++) {
       if (temp[j]=='-')
         temp[j]='_';
@@ -3867 +3867 @@
     char temp[30];
     strcpy(temp,columnName(i).c_str());
-    int length = strlen(temp);
-    for (int j=0;j<length;j++) {
+    size_t length = strlen(temp);
+    for (size_t j=0;j<length;j++) {
       if (temp[j]=='-')
         temp[j]='_';

stable/1.10/Clp/src/ClpSimplex.cpp

@@ -5924 +5924 @@
 int outDoubleArray(double * array, int length, FILE * fp)
 {
-  int numberWritten;
+  size_t numberWritten;
   if (array&&length) {
     numberWritten = fwrite(&length,sizeof(int),1,fp);
@@ -5930 +5930 @@
       return 1;
     numberWritten = fwrite(array,sizeof(double),length,fp);
-    if (numberWritten!=length)
+    if (numberWritten!=(size_t)length)
       return 1;
   } else {
@@ -5947 +5947 @@
   if (fp) {
     Clp_scalars scalars;
-    CoinBigIndex numberWritten;
+    size_t numberWritten;
     // Fill in scalars
     scalars.optimizationDirection = optimizationDirection_;
@@ -5981 +5981 @@
     if (numberWritten!=1)
       return 1;
-    CoinBigIndex length;
+    size_t length;
 #ifndef CLP_NO_STD
     int i;
@@ -6059 +6059 @@
       }
       numberWritten = fwrite(array,lengthNames_+1,numberRows_,fp);
-      if (numberWritten!=numberRows_)
+      if (numberWritten!=(size_t)numberRows_)
         return 1;
       put=array;
@@ -6069 +6069 @@
       }
       numberWritten = fwrite(array,lengthNames_+1,numberColumns_,fp);
-      if (numberWritten!=numberColumns_)
+      if (numberWritten!=(size_t)numberColumns_)
         return 1;
       delete [] array;
@@ -6079 +6079 @@
       numberWritten=fwrite(&marker,sizeof(int),1,fp);
       numberWritten = fwrite(integerType_,1,numberColumns_,fp);
-      if (numberWritten!=numberColumns_)
+      if (numberWritten!=(size_t)numberColumns_)
         return 1;
     } else {
@@ -6105 +6105 @@
     numberWritten = fwrite(matrix_->getVectorStarts(),
                            sizeof(int),numberColumns_+1,fp);
-    if (numberWritten!=numberColumns_+1)
+    if (numberWritten!=(size_t)numberColumns_+1)
       return 1;
     numberWritten = fwrite(matrix_->getVectorLengths(),
                            sizeof(int),numberColumns_,fp);
-    if (numberWritten!=numberColumns_)
+    if (numberWritten!=(size_t)numberColumns_)
       return 1;
     // finished
@@ -6121 +6121 @@
 int inDoubleArray(double * &array, int length, FILE * fp)
 {
-  int numberRead;
+  size_t numberRead;
   int length2;
   numberRead = fread(&length2,sizeof(int),1,fp);
@@ -6132 +6132 @@
     array = new double[length];
     numberRead = fread(array,sizeof(double),length,fp);
-    if (numberRead!=length)
+    if (numberRead!=(size_t)length)
       return 1;
   } 
@@ -6160 +6160 @@
     factorization_->sparseThreshold(1);
     Clp_scalars scalars;
-    CoinBigIndex numberRead;
+    size_t numberRead;
 
     // get scalars
@@ -6192 +6192 @@
     specialOptions_ = scalars.specialOptions;
     // strings
-    CoinBigIndex length;
+    size_t length;
 #ifndef CLP_NO_STD
     for (i=0;i<ClpLastStrParam;i++) {
@@ -6255 +6255 @@
         return 1;
     if (length) {
-      if (length!=numberRows_+numberColumns_)
+      if (length!=(size_t)(numberRows_+numberColumns_))
         return 1;
       status_ = new char unsigned[length];
@@ -6268 +6268 @@
       char * get = array;
       numberRead = fread(array,lengthNames_+1,numberRows_,fp);
-      if (numberRead!=numberRows_)
+      if (numberRead!=(size_t)numberRows_)
         return 1;
       rowNames_ = std::vector<std::string> ();
@@ -6278 +6278 @@
       get = array;
       numberRead = fread(array,lengthNames_+1,numberColumns_,fp);
-      if (numberRead!=numberColumns_)
+      if (numberRead!=(size_t)numberColumns_)
         return 1;
       columnNames_ = std::vector<std::string> ();
@@ -6300 +6300 @@
       integerType_ = new char [numberColumns_];
       numberRead = fread(integerType_,1,numberColumns_,fp);
-      if (numberRead!=numberColumns_)
+      if (numberRead!=(size_t)numberColumns_)
         return 1;
     } else {
@@ -6360 +6360 @@
       return 1;
     numberRead = fread(starts, sizeof(int),numberColumns_+1,fp);
-    if (numberRead!=numberColumns_+1)
+    if (numberRead!=(size_t)numberColumns_+1)
       return 1;
     numberRead = fread(lengths, sizeof(int),numberColumns_,fp);
-    if (numberRead!=numberColumns_)
+    if (numberRead!=(size_t)numberColumns_)
       return 1;
     // assign matrix
@@ -6373 +6373 @@
     for (i=0;i<numberColumns_;i++) {
       int start = starts[i];
-      starts[i]=length;
+      starts[i]=(int)length;
       for (CoinBigIndex j=start;j<start+lengths[i];j++) {
         elements[length]=elements[j];
         indices[length++]=indices[j];
       }
-      lengths[i]=length-starts[i];
-    }
-    starts[numberColumns_]=length;
+      lengths[i]=(int)length-starts[i];
+    }
+    starts[numberColumns_]=(int)length;
     matrix->assignMatrix(true, numberRows_, numberColumns_,
-                         length, elements, indices, starts, lengths);
+                         (CoinBigIndex)length, elements, indices, starts, lengths);
     // and transfer to Clp
     matrix_ = new ClpPackedMatrix(matrix);

stable/1.10/Clp/src/ClpSimplexDual.cpp

@@ -4325 +4325 @@
     handler_->message()<<CoinMessageEol;
   }
+  double approximateObjective=objectiveValue_;
 #ifdef CLP_REPORT_PROGRESS
     if (ixxxxxx>=ixxyyyy-4&&ixxxxxx<=ixxyyyy) {
@@ -5005 +5006 @@
   if (alphaAccuracy_>0.0)
       alphaAccuracy_=1.0;
+  // If we are stopping - use plausible objective
+  // Maybe only in fast dual
+  if (problemStatus_>2)
+    objectiveValue_ = approximateObjective;
 }
 /* While updateDualsInDual sees what effect is of flip

stable/1.10/Clp/src/Clp_C_Interface.cpp

@@ -240 +240 @@
       prefix, numcols, numrows);
     printf("%s model = %p, start = %p, index = %p, value = %p\n",
-      prefix, (void*)model, (void*)start, (void*)index, (void*)value);
+           prefix, reinterpret_cast<const void *>(model), reinterpret_cast<const void *>(start), reinterpret_cast<const void *>(index), reinterpret_cast<const void *>(value));
     printf("%s collb = %p, colub = %p, obj = %p, rowlb = %p, rowub = %p\n",
-      prefix, (void*)collb, (void*)colub, (void*)obj, (void*)rowlb, (void*)rowub);
+           prefix, reinterpret_cast<const void *>(collb), reinterpret_cast<const void *>(colub), reinterpret_cast<const void *>(obj), reinterpret_cast<const void *>(rowlb), reinterpret_cast<const void *>(rowub));
   }
   model->model_->loadProblem(numcols,numrows,start,index,value,
@@ -1130 +1130 @@
     prefix, numcols, numrows, numelem);
   printf("%s model = %p, start = %p, index = %p, value = %p\n",
-    prefix, (void*)model, (void*)start, (void*)index, (void*)value);
+         prefix, reinterpret_cast<const void *>(model), reinterpret_cast<const void *>(start), reinterpret_cast<const void *>(index), reinterpret_cast<const void *>(value));
   clp_simplex->matrix()->dumpMatrix(NULL);
   {
@@ -1142 +1142 @@
   
   printf("%s collb = %p, colub = %p, obj = %p, rowlb = %p, rowub = %p\n",
-    prefix, (void*)collb, (void*)colub, (void*)obj, (void*)rowlb, (void*)rowub);
+         prefix, reinterpret_cast<const void *>(collb), reinterpret_cast<const void *>(colub), reinterpret_cast<const void *>(obj), reinterpret_cast<const void *>(rowlb), reinterpret_cast<const void *>(rowub));
   printf("%s optimization direction = %g\n",prefix, Clp_optimizationDirection(model));
   printf("  (1 - minimize, -1 - maximize, 0 - ignore)\n");

stable/1.10/Clp/src/Makefile.am

@@ -162 +162 @@
         ClpQuadraticObjective.hpp \
         ClpSimplex.hpp \
+        ClpSimplexDual.hpp \
         ClpSimplexNonlinear.hpp \
         ClpSimplexOther.hpp \
@@ -167 +168 @@
         ClpSolve.hpp \
         CbcOrClpParam.hpp \
+        CbcOrClpParam.cpp \
         Idiot.hpp
 

stable/1.10/Clp/src/Makefile.in

@@ -412 +412 @@
         ClpQuadraticObjective.hpp \
         ClpSimplex.hpp \
+        ClpSimplexDual.hpp \
         ClpSimplexNonlinear.hpp \
         ClpSimplexOther.hpp \
@@ -417 +418 @@
         ClpSolve.hpp \
         CbcOrClpParam.hpp \
+        CbcOrClpParam.cpp \
         Idiot.hpp
 

stable/1.10/Clp/src/MyMessageHandler.cpp

@@ -126 +126 @@
 
         // Want maximum of 10 solutions, so if more then 10 get rid of oldest
-        int numExtremePointsSaved = feasibleExtremePoints_.size();
+        size_t numExtremePointsSaved = feasibleExtremePoints_.size();
         if ( numExtremePointsSaved>=10 ) {
           feasibleExtremePoints_.pop_back();
-          assert( feasibleExtremePoints_.size() == 
-                  static_cast<unsigned int> (numExtremePointsSaved)-1 );
+          assert( feasibleExtremePoints_.size() + 1 == numExtremePointsSaved );
         };
 

stable/1.10/Clp/src/unitTest.cpp

@@ -820 +820 @@
     // Write saved solutions
     int nc = model.getNumCols();
-    int s; 
+    size_t s; 
     std::deque<StdVectorDouble> fep = messageHandler.getFeasibleExtremePoints();
-    int numSavedSolutions = fep.size();
+    size_t numSavedSolutions = fep.size();
     for ( s=0; s<numSavedSolutions; ++s ) {
       const StdVectorDouble & solnVec = fep[s];
@@ -1968 +1968 @@
     // Create a structured model
     CoinStructuredModel structured;
-    int numberBlocks=5;
-    for (int i=0;i<numberBlocks;i++) {
+    char numberBlocks=5;
+    for (char i=0;i<numberBlocks;i++) {
       std::string topName="row_master";
       std::string blockName="block_";
-      char bName = 'a'+i;
+      char bName = (char)('a'+i);
       blockName.append(1,bName);
       structured.addBlock(topName,blockName,top);
@@ -1996 +1996 @@
     CoinStructuredModel structured2;
     numberBlocks=3;
-    for (int i=0;i<numberBlocks;i++) {
+    for (char i=0;i<numberBlocks;i++) {
       std::string blockName="block_";
-      char bName = 'a'+i;
+      char bName = (char)('a'+i);
       blockName.append(1,bName);
       structured2.addBlock(blockName,blockName,structured);