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

scipopt · Oct 7, 2024 · 323143d · 323143d
2 parents f430c47 + a34ed2b
commit 323143d
Show file tree

Hide file tree

Showing 8 changed files with 41 additions and 40 deletions.
diff --git a/doc/xternal.c b/doc/xternal.c
@@ -8798,10 +8798,12 @@
   * - There is a <a href="https://github.com/scipopt/MatlabSCIPInterface">Matlab interface</a>
   *   to use SCIP and SCIP-SDP from Matlab and Octave.
   * - <a href="https://github.com/scipopt/JSCIPOpt">JSCIPOpt</a> is an interface for Java.
+  * - <a href="https://github.com/scipopt/russcip">Russcip</a> is an interface for Rust.
+  * - <a href="https://github.com/scipopt/SCIPpp">SCIP++</a> is a modeling interfaces for C++.
   *
   * Contributions to these projects are very welcome.
   *
-  * There are also several third-party python interfaces to the \SCIP Optimization Suite:
+  * There are also many third-party python interfaces to the \SCIP Optimization Suite, for example:
   * - <a href="https://github.com/eomahony/Numberjack">NUMBERJACK</a> is a constraint programming platform implemented in python.
   *   It supports a variety of different solvers, one of them being the \SCIP Optimization Suite .
   * - <a href="http://code.google.com/p/python-zibopt/">python-zibopt</a> was developed

diff --git a/src/scip/cons_orbitope.c b/src/scip/cons_orbitope.c
@@ -123,7 +123,7 @@
 #include "scip/scip_sol.h"
 #include "scip/scip_var.h"
 #include "scip/symmetry.h"
-#include <symmetry/type_symmetry.h>
+#include "symmetry/type_symmetry.h"
 
 /* constraint handler properties */
 #define CONSHDLR_NAME          "orbitope"

diff --git a/src/scip/prop_symmetry.c b/src/scip/prop_symmetry.c
@@ -103,36 +103,36 @@
 
 /*---+----1----+----2----+----3----+----4----+----5----+----6----+----7----+----8----+----9----+----0----+----1----+----2*/
 
-#include <scip/cons_linear.h>
-#include <scip/cons_knapsack.h>
-#include <scip/cons_varbound.h>
-#include <scip/cons_setppc.h>
-#include <scip/cons_and.h>
-#include <scip/cons_logicor.h>
-#include <scip/cons_or.h>
-#include <scip/cons_orbitope.h>
-#include <scip/cons_symresack.h>
-#include <scip/cons_xor.h>
-#include <scip/cons_linking.h>
-#include <scip/cons_bounddisjunction.h>
-#include <scip/cons_indicator.h>
-#include <scip/cons_nonlinear.h>
-#include <scip/cons_sos1.h>
-#include <scip/cons_sos2.h>
-#include <scip/expr_pow.h>
-#include <scip/expr_product.h>
-#include <scip/pub_expr.h>
-#include <scip/misc.h>
-#include <scip/scip_datastructures.h>
-
-#include <scip/prop_symmetry.h>
-#include <symmetry/compute_symmetry.h>
-#include <scip/event_shadowtree.h>
-#include <scip/symmetry.h>
-#include <scip/symmetry_graph.h>
-#include <scip/symmetry_orbitopal.h>
-#include <scip/symmetry_orbital.h>
-#include <scip/symmetry_lexred.h>
+#include "scip/cons_linear.h"
+#include "scip/cons_knapsack.h"
+#include "scip/cons_varbound.h"
+#include "scip/cons_setppc.h"
+#include "scip/cons_and.h"
+#include "scip/cons_logicor.h"
+#include "scip/cons_or.h"
+#include "scip/cons_orbitope.h"
+#include "scip/cons_symresack.h"
+#include "scip/cons_xor.h"
+#include "scip/cons_linking.h"
+#include "scip/cons_bounddisjunction.h"
+#include "scip/cons_indicator.h"
+#include "scip/cons_nonlinear.h"
+#include "scip/cons_sos1.h"
+#include "scip/cons_sos2.h"
+#include "scip/expr_pow.h"
+#include "scip/expr_product.h"
+#include "scip/pub_expr.h"
+#include "scip/misc.h"
+#include "scip/scip_datastructures.h"
+
+#include "scip/prop_symmetry.h"
+#include "symmetry/compute_symmetry.h"
+#include "scip/event_shadowtree.h"
+#include "scip/symmetry.h"
+#include "scip/symmetry_graph.h"
+#include "scip/symmetry_orbitopal.h"
+#include "scip/symmetry_orbital.h"
+#include "scip/symmetry_lexred.h"
 
 #include <math.h>
 #include <string.h>

diff --git a/src/scip/prop_symmetry.h b/src/scip/prop_symmetry.h
@@ -35,9 +35,8 @@
 #ifndef __SCIP_PROP_SYMMETRY_H_
 #define __SCIP_PROP_SYMMETRY_H_
 
-#include <scip/scip.h>
-
-#include <symmetry/type_symmetry.h>
+#include "scip/scip.h"
+#include "symmetry/type_symmetry.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/scip/symmetry.h b/src/scip/symmetry.h
@@ -40,7 +40,7 @@
 #include "scip/type_retcode.h"
 #include "scip/type_scip.h"
 #include "scip/type_var.h"
-#include <symmetry/type_symmetry.h>
+#include "symmetry/type_symmetry.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/scip/symmetry_graph.c b/src/scip/symmetry_graph.c
@@ -33,8 +33,8 @@
 #include "scip/symmetry_graph.h"
 #include "scip/scip.h"
 #include "scip/misc.h"
-#include <symmetry/struct_symmetry.h>
-#include <symmetry/type_symmetry.h>
+#include "symmetry/struct_symmetry.h"
+#include "symmetry/type_symmetry.h"
 
 
 /** creates and initializes a symmetry detection graph with memory for the given number of nodes and edges

diff --git a/src/scip/symmetry_graph.h b/src/scip/symmetry_graph.h
@@ -37,7 +37,7 @@
 #include "scip/type_retcode.h"
 #include "scip/type_scip.h"
 #include "scip/type_var.h"
-#include <symmetry/type_symmetry.h>
+#include "symmetry/type_symmetry.h"
 
 #ifdef __cplusplus
 extern "C" {

diff --git a/src/scip/symmetry_orbitopal.c b/src/scip/symmetry_orbitopal.c
@@ -106,8 +106,8 @@
 #include "scip/struct_tree.h"
 #include "scip/symmetry.h"
 #include "scip/debug.h"
+#include "symmetry/type_symmetry.h"
 #include <string.h>
-#include <symmetry/type_symmetry.h>
 
 
 /* symmetry handler properties */