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

scipopt · Dec 10, 2024 · 25140d9 · 25140d9
2 parents d859d5f + 759f449
commit 25140d9
Show file tree

Hide file tree

Showing 8 changed files with 94 additions and 85 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -163,6 +163,7 @@ Fixed bugs
 - fixed bug in calculation of "fractionality score" for spatial branching candidates in cons_nonlinear
 - fixed bug with installing symmetry dialog in sub-SCIPs
 - add copy callbacks for default plugins presolver dualagg, presolver redvub, branchrule lookahead, branchrule cloud, heuristic dualval, heuristic repair, propagator nlobbt, separator gauge, and separator convexproj missing in SCIPsetCopyPlugins()
+- respect maximal round setting of separation by running remaining delayed separators in last round
 
 Unit tests
 ----------

diff --git a/doc/scipfooter.html b/doc/scipfooter.html
@@ -1,4 +1,4 @@
-<!-- HTML footer for doxygen 1.8.13-->
+<!-- HTML footer for doxygen 1.9.4-->
 <!-- start footer part -->
 <!--BEGIN GENERATE_TREEVIEW-->
 <div id="nav-path" class="navpath"><!-- id is needed for treeview function! -->
@@ -7,9 +7,7 @@
     <li class="footer">
     &copy; 2002-2024 by Zuse Institute Berlin (ZIB), <a href="http://www.zib.de/impressum_datenschutz">Imprint</a>
     </li>
-    <li class="footer">$generatedby
-    <a href="http://www.doxygen.org/index.html">
-    <img class="footer" src="$relpath^doxygen.png" alt="doxygen"/></a> $doxygenversion </li>
+    <li class="footer">$generatedby <a href="https://www.doxygen.org/index.html"><img class="footer" src="$relpath^doxygen.svg" width="104" height="31" alt="doxygen"/></a> $doxygenversion </li>
   </ul>
 </div>
 <!--END GENERATE_TREEVIEW-->
@@ -21,7 +19,7 @@
       &copy; 2002-2024 by Zuse Institute Berlin (ZIB), <a href="http://www.zib.de/impressum_datenschutz">Imprint</a>
     </td>
     <td align="right" class="footer">
-      Generated on $date for $projectname by <a href="http://www.doxygen.org/index.html">doxygen</a> ($doxygenversion)
+      Generated on $date for $projectname by <a href="https://www.doxygen.org/index.html">doxygen</a> ($doxygenversion)
     </td>
   </tr>
 </table>

diff --git a/doc/scipheader.html b/doc/scipheader.html
@@ -1,14 +1,19 @@
-<!-- HTML header for doxygen 1.8.13-->
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<!-- HTML header for doxygen 1.9.4-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "https://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
 <html xmlns="http://www.w3.org/1999/xhtml">
 <head>
 <meta http-equiv="Content-Type" content="text/xhtml;charset=UTF-8"/>
-<meta http-equiv="X-UA-Compatible" content="IE=9"/>
+<meta http-equiv="X-UA-Compatible" content="IE=11"/>
 <meta name="generator" content="Doxygen $doxygenversion"/>
 <meta name="viewport" content="width=device-width, initial-scale=1"/>
 <!--BEGIN PROJECT_NAME--><title>$projectname: $title</title><!--END PROJECT_NAME-->
 <!--BEGIN !PROJECT_NAME--><title>$title</title><!--END !PROJECT_NAME-->
 <link href="$relpath^tabs.css" rel="stylesheet" type="text/css"/>
+<!--BEGIN DISABLE_INDEX-->
+  <!--BEGIN FULL_SIDEBAR-->
+<script type="text/javascript">var page_layout=1;</script>
+  <!--END FULL_SIDEBAR-->
+<!--END DISABLE_INDEX-->
 <script type="text/javascript" src="$relpath^jquery.js"></script>
 <script type="text/javascript" src="$relpath^dynsections.js"></script>
 $treeview
@@ -18,37 +23,49 @@
 $extrastylesheet
 </head>
 <body>
+<!--BEGIN DISABLE_INDEX-->
+  <!--BEGIN FULL_SIDEBAR-->
+<div id="side-nav" class="ui-resizable side-nav-resizable"><!-- do not remove this div, it is closed by doxygen! -->
+  <!--END FULL_SIDEBAR-->
+<!--END DISABLE_INDEX-->
+
 <div id="top"><!-- do not remove this div, it is closed by doxygen! -->
 
 <!--BEGIN TITLEAREA-->
 <div id="titlearea">
 <table cellspacing="0" cellpadding="0">
  <tbody>
- <tr style="height: 56px;">
+ <tr id="projectrow">
   <!--BEGIN PROJECT_NAME-->
-  <td id="projectalign" style="padding-left: 0.5em;">
-   <div id="projectname">$projectname
-   <!--BEGIN PROJECT_NUMBER-->&#160;<span id="projectnumber">$projectnumber</span><!--END PROJECT_NUMBER-->
+    <td id="projectalign">
+   <div id="projectname">$projectname<!--BEGIN PROJECT_NUMBER--><span id="projectnumber">&#160;$projectnumber</span><!--END PROJECT_NUMBER-->
    </div>
    <!--BEGIN PROJECT_BRIEF--><div id="projectbrief">$projectbrief</div><!--END PROJECT_BRIEF-->
   </td>
   <!--END PROJECT_NAME-->
-<!--BEGIN PROJECT_LOGO-->
+  <!--BEGIN PROJECT_LOGO-->
   <td id="projectlogo"><a href="$relpath$scippy.png" target="_blank"><img class="header" src="$relpath$miniscippy.png" alt="scippy"  border="0"></a></td>
   <!--END PROJECT_LOGO-->
   <!--BEGIN !PROJECT_NAME-->
    <!--BEGIN PROJECT_BRIEF-->
-    <td style="padding-left: 0.5em;">
+    <td>
     <div id="projectbrief">$projectbrief</div>
     </td>
    <!--END PROJECT_BRIEF-->
   <!--END !PROJECT_NAME-->
   <!--BEGIN DISABLE_INDEX-->
    <!--BEGIN SEARCHENGINE-->
+     <!--BEGIN !FULL_SIDEBAR-->
    <td>$searchbox</td>
+     <!--END !FULL_SIDEBAR-->
    <!--END SEARCHENGINE-->
   <!--END DISABLE_INDEX-->
  </tr>
+  <!--BEGIN SEARCHENGINE-->
+   <!--BEGIN FULL_SIDEBAR-->
+   <tr><td colspan="2">$searchbox</td></tr>
+   <!--END FULL_SIDEBAR-->
+  <!--END SEARCHENGINE-->
  </tbody>
 </table>
 </div>

diff --git a/doc/xternal.c b/doc/xternal.c
@@ -2626,7 +2626,8 @@
  *
  * \par SEPA_DELAY: the default for whether the separation method should be delayed, if other separators or constraint handlers found cuts.
  * If the separator's separation method is marked to be delayed, it is only executed after no other separator
- * or constraint handler found a cut during the price-and-cut loop.
+ * or constraint handler found a cut during the price-and-cut loop, and in the last separation or stalling round,
+ * either in the end, or in an additional round if only the maximal subsequent round is exceeded.
  * If the separation method of the separator is very expensive, you may want to mark it to be delayed until all cheap
  * separation methods have been executed.
  *
@@ -7856,33 +7857,33 @@
  *  @section SRCORGA_CORE SCIP core components
  *
  *  - Each core component has an implementation with an internal API and a public API.
- *  - The internal implementation should be in a file <code><component>.c,h</code> and should not be included in the public API.
- *  - Internal API functions usually do not take a <code>SCIP*</code> parameter, but a pointer to the component as first argument and pointers to internal structures like <code>SCIP_SET*</code> or <code>SCIP_STAT*</code>, where necessary.
- *  - The name of internal API functions follows the style `SCIP<component><operation>...`, e.g., <code>SCIPvarCreate()</code> or <code>SCIPvarAddLocks()</code>.
- *  - <code>pub_<component>.h</code> declares the functions of the public API that do not need a SCIP pointer.
+ *  - The internal implementation should be in a file `<component>.c,h` and should not be included in the public API.
+ *  - Internal API functions usually do not take a `SCIP*` parameter, but a pointer to the component as first argument and pointers to internal structures like `SCIP_SET*` or `SCIP_STAT*`, where necessary.
+ *  - The name of internal API functions follows the style `SCIP<component><operation>...`, e.g., <code>SCIPvarCreateOriginal()</code> or <code>SCIPvarAddLocks()</code>.
+ *  - `pub_<component>.h` declares the functions of the public API that do not need a SCIP pointer.
  *    Often, these are getter-functions.
  *    For example, \ref pub_var.h contains public variable API functions.
- *  - Functions in <code>pub_<component>.h</code> follow the same naming style as those in <code><component>.h</code> and are used by the implementation of the internal API as well.
- *  - <code>scip_<component>.h</code> declares the functions of the public API that need a SCIP instance (<code>SCIP*</code>), e.g., \ref scip_var.h for public variable manipulation functions.
- *    Functions declared in <code>scip_<component>.h</code> are often thin wrappers that call the internal API functions from <code><component>.h</code>.
- *    These functions should follow the naming style `SCIP<operation><component>...`, e.g., <code>SCIPcreateVar()</code> or <code>SCIPaddVarLocks</code>.
+ *  - Functions in `pub_<component>.h` follow the same naming style as those in `<component>.h` and are used by the implementation of the internal API as well.
+ *  - `scip_<component>.h` declares the functions of the public API that need a SCIP instance (`SCIP*`), e.g., \ref scip_var.h for public variable manipulation functions.
+ *    Functions declared in `scip_<component>.h` are often thin wrappers that call the internal API functions from `<component>.h`.
+ *    These functions should follow the naming style `SCIP<operation><component>...`, e.g., <code>SCIPcreateVarOriginal()</code> or <code>SCIPaddVarLocks()</code>.
  *  - To ensure functions of the public API being reachable in shared libraries, their declaration needs to contain the <code>SCIP_EXPORT</code> attribute.
- *  - Public types (typedef's, enumerations) are defined in file <code>type_<component>.h</code>.
- *    Type names follow the style <code>SCIP_<COMPONENT>...</code>. For every struct, we have a typedef that shortens the name 
- *    (so one could for instance use <code>SCIP_PARAM</code> instead of <code>struct SCIP_Param</code>).
+ *  - Public types (typedef's, enumerations) are defined in file `type_<component>.h`.
+ *    Type names follow the style `SCIP_<COMPONENT>...`. For every struct, we have a typedef that shortens the name
+ *    (so one could for instance use `SCIP_PARAM` instead of `struct SCIP_Param`).
  *    The convention is to have the mixed-casing for the struct name, and then all-capital for the typedef's type. Similar for enums.
- *  - Structs that need to be accessed by several source files are defined in <code>struct_<component>.h</code>.
- *    <code>struct_<component>.h</code> is usually included only by <code><component>.c</code> and maybe <code>scip_<component>.c</code>.
+ *  - Structs that need to be accessed by several source files are defined in `struct_<component>.h`.
+ *    `struct_<component>.h` is usually included only by `<component>.c` and maybe `scip_<component>.c`.
  *    Exceptions are due to manual inlining of functions via macros when compiling for optimized mode.
  *  - All types, structs, and functions are documented with Doxygen-style comments.
  *    The documentation of the implementation of a function must repeat the documentation of the function declaration exactly (for doxygen to treat them as identical).
  *
  *  @section SRCORGA_PLUGINS Plugins
- *  - Each plugin is defined in files <code><type>_<name>.c,h</code>, e.g.,
+ *  - Each plugin is defined in files `<type>_<name>.c,h`, e.g.,
  *     \ref cons_knapsack.c implements the Knapsack constraint handler plugin and
  *     \ref cons_knapsack.h declares its public API functions.
- *  - Public types that belong to a plugin are declared in its header, <code><type>_<name>.h</code>.
- *  - API functions of plugins are named as <code>SCIP<operation>...<Name></code>, e.g., <code>SCIPincludeConshdlrAnd()</code>, <code>SCIPcreateConsAnd()</code>, or <code>SCIPgetNVarsAnd()</code>.
+ *  - Public types that belong to a plugin are declared in its header, `<type>_<name>.h`.
+ *  - API functions of plugins are named as `SCIP<operation>...<Name>`, e.g., <code>SCIPincludeConshdlrAnd()</code>, <code>SCIPcreateConsAnd()</code>, or <code>SCIPgetNVarsAnd()</code>.
  *  - Plugins access only the public API.
  *  - Plugins that need to be included by default should be registered in <code>src/scip/scipdefplugins.c</code>.
  */

diff --git a/src/scip/def.h b/src/scip/def.h
@@ -104,11 +104,11 @@
  */
 #ifndef SCIP_EXPORT
 #if defined(_WIN32)
-#define SCIP_EXPORT __declspec(dllexport)
+#define SCIP_EXPORT __declspec(dllexport)                         /**< mark symbol to be exported in DLL */
 #elif defined(__GNUC__) && __GNUC__ >= 4
-#define SCIP_EXPORT __attribute__((__visibility__("default")))
+#define SCIP_EXPORT __attribute__((__visibility__("default")))    /**< mark symbol to be visible in shared library */
 #else
-#define SCIP_EXPORT
+#define SCIP_EXPORT                                               /**< no symbol export attribute known for current compiler */
 #endif
 #endif
 

diff --git a/src/scip/scip_expr.c b/src/scip/scip_expr.c
@@ -1366,12 +1366,12 @@ SCIP_RETCODE SCIPcopyExpr(
  * a `Term` is a product of `Factors` and an `Expression` is a sum of `Terms`.
  *
  * The actual definition:
- * <pre>
+ * ```
  * Expression -> ["+" | "-"] Term { [ ("+" | "-" | "number *") Term | ("number" <varname>) ] }
  * Term       -> Factor { ("*" | "/" ) Factor }
  * Factor     -> Base [ "^" "number" | "^(" "number" ")" ]
  * Base       -> "number" | "<varname>" | "(" Expression ")" | Op "(" OpExpression ")
- * </pre>
+ * ```
  * where `[a|b]` means `a` or `b` or none, `(a|b)` means `a` or `b`, `{a}` means 0 or more `a`.
  *
  * Note that `Op` and `OpExpression` are undefined.

diff --git a/src/scip/scip_expr.h b/src/scip/scip_expr.h
@@ -277,12 +277,12 @@ SCIP_RETCODE SCIPcopyExpr(
  * a `Term` is a product of `Factors` and an `Expression` is a sum of `Terms`.
  *
  * The actual definition:
- * <pre>
+ * ```
  * Expression -> ["+" | "-"] Term { [ ("+" | "-" | "number *") Term | ("number" <varname>) ] }
  * Term       -> Factor { ("*" | "/" ) Factor }
  * Factor     -> Base [ "^" "number" | "^(" "number" ")" ]
  * Base       -> "number" | "<varname>" | "(" Expression ")" | Op "(" OpExpression ")
- * </pre>
+ * ```
  * where `[a|b]` means `a` or `b` or none, `(a|b)` means `a` or `b`, `{a}` means 0 or more `a`.
  *
  * Note that `Op` and `OpExpression` are undefined.