Merge branch 'v9-minor'

Author: svigerske

Diff for: CHANGELOG

@@ -105,11 +105,18 @@ Fixed bugs
 ----------
 
 - fixed bug in detection of double lex matrices due to wrong memory allocation
+- fixed bug where parameter `limits/objectivestop` was copied to subscips in plugins which have different objectives
 
 
 Miscellaneous
 -------------
 
+Build system
+------------
+
+### Cmake
+
+- removed replacement of the settings of RelWithDebInfo
 
 
 @section RN900 SCIP 9.0.0

Diff for: pclint/scip.lnt

@@ -120,6 +120,7 @@
 // is likely uninitialized
 -emacro(530,va_*)
 -ecall(530,vsnprintf)
+-emacro(530,SCIPalloc*)
 
 // ignoring return value of function
 -esym(534,printf,fprintf,fclose,fputs,fputc,fseek,fflush,strcat,strcpy,SCIPfclose,SCIPfseek,memset,memcpy,memmove)

Diff for: src/scip/cons_components.c

@@ -494,6 +494,7 @@ SCIP_RETCODE createSubscip(
       /* disable solution limits */
       SCIP_CALL( SCIPsetIntParam(*subscip, "limits/solutions", -1) );
       SCIP_CALL( SCIPsetIntParam(*subscip, "limits/bestsol", -1) );
+      SCIP_CALL( SCIPresetParam(*subscip, "limits/objectivestop") );
 
       /* reduce the effort spent for hash tables; however, if the debug solution is enabled and valid in this subtree,
        * hash tables are needed for installing the debug solution

Diff for: src/scip/heur_dualval.c

@@ -971,6 +971,9 @@ SCIP_RETCODE createSubSCIP(
    /* copy parameter settings */
    SCIP_CALL( SCIPcopyParamSettings(scip, heurdata->subscip) );
 
+   /* disable objective stop in subscip */
+   SCIP_CALL( SCIPresetParam(heurdata->subscip, "limits/objectivestop") );
+
    /* create problem in sub-SCIP */
 
    /* get name of the original problem and add "dualval" */

Diff for: src/scip/heur_lpface.c

@@ -475,6 +475,8 @@ SCIP_RETCODE setSubscipLimits(
    /* set also the other two limits */
    SCIP_CALL( SCIPsetRealParam(subscip, "limits/time", timelimit) );
    SCIP_CALL( SCIPsetRealParam(subscip, "limits/memory", memorylimit) );
+   /* disable objective stop */
+   SCIP_CALL( SCIPresetParam(subscip, "limits/objectivestop") );
 
    return SCIP_OKAY;
 }

Diff for: src/scip/heur_repair.c

@@ -940,6 +940,9 @@ SCIP_RETCODE applyRepair(
    SCIP_CALL( SCIPsetRealParam(subscip, "limits/memory", memorylimit) );
    SCIP_CALL( SCIPsetObjlimit(subscip,1.0) );
 
+   /* disable objective stop */
+   SCIP_CALL( SCIPresetParam(subscip, "limits/objectivestop") );
+
    /* forbid recursive call of heuristics and separators solving sub-SCIPs */
    SCIP_CALL( SCIPsetSubscipsOff(subscip, TRUE) );
 

Diff for: src/scip/heur_subnlp.c

@@ -392,6 +392,7 @@ SCIP_RETCODE createSubSCIP(
    SCIP_CALL( SCIPresetParam(heurdata->subscip, "limits/solutions") );
    SCIP_CALL( SCIPresetParam(heurdata->subscip, "limits/time") );
    SCIP_CALL( SCIPresetParam(heurdata->subscip, "limits/totalnodes") );
+   SCIP_CALL( SCIPresetParam(heurdata->subscip, "limits/objectivestop") );
 
    /* we remember here which way (continuous or not) we went, in case all binary and integer vars get fixed in root */
    heurdata->continuous = SCIPgetNBinVars(heurdata->subscip) == 0 && SCIPgetNIntVars(heurdata->subscip) == 0;

Diff for: src/scip/heuristics.c

@@ -988,6 +988,9 @@ SCIP_RETCODE SCIPcopyLargeNeighborhoodSearch(
       /* copy parameter settings */
       SCIP_CALL( SCIPcopyParamSettings(sourcescip, subscip) );
 
+      /* disable objective stop in subscip since objective might be changed */
+      SCIP_CALL( SCIPresetParam(subscip, "limits/objectivestop") );
+
       /* create linear constraints from LP rows of the source problem */
       SCIP_CALL( createRows(sourcescip, subscip, varmap) );
    }

Diff for: src/scip/scip_copy.c

@@ -3326,6 +3326,7 @@ SCIP_RETCODE SCIPcopyLimits(
    SCIP_CALL( SCIPsetIntParam(targetscip, "limits/solutions", -1) );
    SCIP_CALL( SCIPsetLongintParam(targetscip, "limits/stallnodes", -1LL) );
    SCIP_CALL( SCIPsetLongintParam(targetscip, "limits/totalnodes", -1LL) );
+   SCIP_CALL( SCIPsetRealParam(targetscip, "limits/objectivestop", SCIP_INVALID) );
 
    return SCIP_OKAY;
 }