Merge remote-tracking branch 'upstream/master'

.github/workflows/windows-ci.yml

@@ -88,14 +88,11 @@ jobs:
           copy ${{ github.event.repository.name }}\AUTHORS.* dist\.
           copy ${{ github.event.repository.name }}\LICENSE.* dist\.
           mkdir dist\bin
-          copy ${{ github.event.repository.name }}\MSVisualStudio\v17\x64\Release\*.exe dist\bin\.
-          mkdir dist\include\coin
-          copy ${{ github.event.repository.name }}\src\*.h dist\include\coin\.
-          copy ${{ github.event.repository.name }}\src\*.hpp dist\include\coin\.
-          mkdir dist\lib
-          copy ${{ github.event.repository.name }}\MSVisualStudio\v17\x64\Release\*.lib dist\lib\.
-          mkdir dist\share\coin\Data
-          xcopy Data dist\share\coin\Data\. /s /e
+          copy ${{ github.event.repository.name }}\MSVisualStudio\v17\x64\Release\*.exe dist\bin\
+          mkdir dist\share
+          if exist .\Data\Sample xcopy .\Data\Sample dist\share\coin-or-sample /i
+          if exist .\Data\Netlib xcopy .\Data\Netlib dist\share\coin-or-netlib /i
+          if exist .\Data\Miplib3 xcopy .\Data\Miplib3 dist\share\coin-or-miplib3 /i
       - name: Build project using coinbrew
         if: ${{ matrix.arch != 'msvs' }}
         run: |

.gitignore

@@ -1,5 +1,14 @@
-
+# Ignore VS files
+*.suo
+*.db
+*.bak
+*.user
+**/.vs/
+**/MSVisualStudio/**/Release/
+**/MSVisualStudio/**/ReleaseParallel/
+**/MSVisualStudio/**/Debug/
+
 # Ignore files created during unit tests
-/MSVisualStudio/v17/*.mps
-/MSVisualStudio/v17/*.lp
-/MSVisualStudio/v17/*.out
+**/MSVisualStudio/**/*.mps
+**/MSVisualStudio/**/*.lp
+**/MSVisualStudio/**/*.out

src/ClpSimplexOther.cpp

@@ -1807,9 +1807,9 @@ ClpSimplexOther::crunch(double *rhs, int *whichRow, int *whichColumn,
   const int *row = matrix_->getIndices();
   const CoinBigIndex *columnStart = matrix_->getVectorStarts();
   const int *columnLength = matrix_->getVectorLengths();
-  char * flags;
-  double * maxdown;
-  double * maxup;
+  char * flags = NULL;
+  double * maxdown = NULL;
+  double * maxup = NULL;
   if (takeOutSome) {
     flags = new char [numberRows_];
     maxdown = new double [2*numberRows_];

src/ClpSolve.cpp

@@ -3850,7 +3850,9 @@ int ClpSimplex::initialSolve(ClpSolve &options)
       int savePerturbation = perturbation();
       if (savePerturbation == 50)
         setPerturbation(51); // small
-      if (!finalStatus || finalStatus == 2 || (moreSpecialOptions_ & 2) == 0 || fabs(sumDual) + fabs(sumPrimal) < 1.0e-3) {
+      if ((finalStatus>=0 && finalStatus <= 2) ||
+	  (moreSpecialOptions_ & 2) == 0 ||
+	  fabs(sumDual) + fabs(sumPrimal) < 1.0e-3) {
         if (finalStatus == 2) {
           if (sumDual > 1.0e-4) {
             // unbounded - get feasible first