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

Author: scip-ci

CHANGELOG

@@ -230,6 +230,7 @@ Interface changes
 - SCIPvarGetMinAggrCoef() and SCIPvarGetMaxAggrCoef() to get bounds on absolute aggregation coefficients for a loose variable;
   SCIPisVarAggrCoefAcceptable() to check whether bounds on aggregation coefficients would exceed thresholds when using a loose variable in another aggregation
 - SCIPgetNRootIntFixings() to retrieve the number of integer fixings at the root node
+- added SCIPcollectMemoryGarbage() to explicitly trigger garbage collection on block memory; before SCIP 10, this was done in SCIPtransformProb()
 
 ### Changes in preprocessor macros
 

src/scip/scip_mem.c

@@ -200,3 +200,21 @@ void SCIPprintMemoryDiagnostic(
    SCIPmessagePrintInfo(scip->messagehdlr, "\nClean Memory Buffers:\n");
    BMSprintBufferMemory(SCIPcleanbuffer(scip));
 }
+
+/** run garbage collection on block memory
+ *
+ * For both settings and problems block memory, frees unused chunks in chunk blocks
+ * and frees chunk blocks that have no chunks by calling BMSgarbagecollectBlockMemory().
+ * Note that the former (freeing unused chunks) is also done automatically when a
+ * chunk block has many unused chunks.
+ */
+void SCIPcollectMemoryGarbage(
+   SCIP*                 scip                /**< SCIP data structure */
+   )
+{
+   assert(scip != NULL);
+   assert(scip->mem != NULL);
+
+   BMSgarbagecollectBlockMemory(scip->mem->setmem);
+   BMSgarbagecollectBlockMemory(scip->mem->probmem);
+}

src/scip/scip_mem.h

@@ -237,6 +237,18 @@ void SCIPprintMemoryDiagnostic(
    SCIP*                 scip                /**< SCIP data structure */
    );
 
+/** run garbage collection on block memory
+ *
+ * For both settings and problems block memory, frees unused chunks in chunk blocks
+ * and frees chunk blocks that have no chunks by calling BMSgarbagecollectBlockMemory().
+ * Note that the former (freeing unused chunks) is also done automatically when a
+ * chunk block has many unused chunks.
+ */
+SCIP_EXPORT
+void SCIPcollectMemoryGarbage(
+   SCIP*                 scip                /**< SCIP data structure */
+   );
+
 /** @} */
 
 #ifdef __cplusplus

src/scip/scip_solve.c

@@ -250,10 +250,6 @@ SCIP_RETCODE SCIPtransformProb(
       return SCIP_PLUGINNOTFOUND;
    }
 
-   /* call garbage collector on original problem and parameter settings memory spaces */
-   BMSgarbagecollectBlockMemory(scip->mem->setmem);
-   BMSgarbagecollectBlockMemory(scip->mem->probmem);
-
    /* remember number of constraints */
    SCIPprobMarkNConss(scip->origprob);