Merge remote-tracking branch 'origin/v9-minor'

INSTALL.md

@@ -206,7 +206,7 @@ Parameters can be set all at once or in subsequent calls to `cmake` - extending
 Testing with CTest
 ------------------
 
-There is an extensive test suite written for [CTest]("https://cmake.org/cmake/help/latest/manual/ctest.1.html)
+There is an extensive test suite written for [CTest](https://cmake.org/cmake/help/latest/manual/ctest.1.html)
 that may take a while to complete.
 To perform a quick test to see whether the compilation was really successful you may run `make check`.
 To see all available tests, run

Makefile

@@ -85,6 +85,7 @@ BUILDFLAGS =	" ARCH=$(ARCH)\\n\
 		EXPRINT=$(EXPRINT)\\n\
 		GMP=$(GMP)\\n\
 		IPOPTOPT=$(IPOPTOPT)\\n\
+		LAPACK=$(LAPACK)\\n\
 		LPSCHECK=$(LPSCHECK)\\n\
 		LPSOPT=$(LPSOPT)\\n\
 		NOBLKBUFMEM=$(NOBLKBUFMEM)\\n\

src/scip/cons_countsols.c

@@ -414,7 +414,7 @@ SCIP_RETCODE checkParameters(
          valid = FALSE;
    }
 
-   if( valid )
+   if( !valid )
    {
       SCIPverbMessage(scip, SCIP_VERBLEVEL_FULL, NULL,
          "At least one heuristic is not turned off! Heuristic solutions are currently not accepted while couting.\n");

src/scip/lapack_calls.c

@@ -283,12 +283,12 @@ SCIP_RETCODE lapackComputeEigenvalues(
 
    /* allocate workspace */
    LWORK = SCIP_RealTOINT(WSIZE);
-   LIWORK = WISIZE;
+   LIWORK = MAX(1, 10 * N);  /* the size is also returned in WISIZE, but is always equal to the value used here */
 
    SCIP_ALLOC( BMSallocBufferMemoryArray(bufmem, &WORK, (int) LWORK) );
    SCIP_ALLOC( BMSallocBufferMemoryArray(bufmem, &IWORK, (int) LIWORK) );
    SCIP_ALLOC( BMSallocBufferMemoryArray(bufmem, &WTMP, (int) N) );
-   SCIP_ALLOC( BMSallocBufferMemoryArray(bufmem, &ISUPPZ, 2) ); /*lint !e506*/
+   SCIP_ALLOC( BMSallocBufferMemoryArray(bufmem, &ISUPPZ, 2 * n) ); /*lint !e506*/
    if ( geteigenvectors )
    {
       SCIP_ALLOC( BMSallocBufferMemoryArray(bufmem, &Z, n * n) ); /*lint !e647*/