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

scip-ci · scip-ci · commit 5c4b0b985c21 · 2025-04-23T15:37:56.000+02:00
diff --git a/src/scip/scip_debug.c b/src/scip/scip_debug.c
@@ -45,6 +45,7 @@
 #include "scip/debug.h"
 #include "scip/pub_message.h"
 #include "scip/scip_debug.h"
+#include "scip/scip_prop.h"
 
 /** enable debug solution mechanism
  *
@@ -60,6 +61,9 @@ void SCIPenableDebugSol(
 {
    SCIP_CALL_ABORT( SCIPcheckStage(scip, "SCIPenableDebugSol", TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE) );
 
+   if( SCIPfindProp(scip, "debug") == NULL )
+      (void)SCIPdebugIncludeProp(scip);
+
    SCIPdebugSolEnable(scip);
 }
 
diff --git a/src/scip/scipdefplugins.c b/src/scip/scipdefplugins.c
@@ -278,7 +278,5 @@ SCIP_RETCODE SCIPincludeDefaultPlugins(
    SCIP_CALL( SCIPincludeBendersDefault(scip) );
    SCIP_CALL( SCIPincludeRelaxBenders(scip) );
 
-   SCIP_CALL( SCIPdebugIncludeProp(scip) ); /*lint !e506 !e774*/
-
    return SCIP_OKAY;
 }

Original file line number	Diff line number	Diff line change
`@@ -45,6 +45,7 @@`
`45`	`45`	`#include "scip/debug.h"`
`46`	`46`	`#include "scip/pub_message.h"`
`47`	`47`	`#include "scip/scip_debug.h"`
	`48`	`+#include "scip/scip_prop.h"`
`48`	`49`
`49`	`50`	`/** enable debug solution mechanism`
`50`	`51`	`*`
`@@ -60,6 +61,9 @@ void SCIPenableDebugSol(`
`60`	`61`	`{`
`61`	`62`	`SCIP_CALL_ABORT( SCIPcheckStage(scip, "SCIPenableDebugSol", TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, TRUE, FALSE) );`
`62`	`63`
	`64`	`+ if( SCIPfindProp(scip, "debug") == NULL )`
	`65`	`+ (void)SCIPdebugIncludeProp(scip);`
	`66`	`+`
`63`	`67`	`SCIPdebugSolEnable(scip);`
`64`	`68`	`}`
`65`	`69`
Original file line number	Diff line number	Diff line change
`@@ -278,7 +278,5 @@ SCIP_RETCODE SCIPincludeDefaultPlugins(`
`278`	`278`	`SCIP_CALL( SCIPincludeBendersDefault(scip) );`
`279`	`279`	`SCIP_CALL( SCIPincludeRelaxBenders(scip) );`
`280`	`280`
`281`		`- SCIP_CALL( SCIPdebugIncludeProp(scip) ); /lint !e506 !e774/`
`282`		`-`
`283`	`281`	`return SCIP_OKAY;`
`284`	`282`	`}`