Merge branch 'v91-bugfix' into v9-minor

scipopt · Sep 14, 2024 · ff24af8 · ff24af8
2 parents 9e463a9 + b5e987f
commit ff24af8
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 4 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -47,6 +47,31 @@ Miscellaneous
 
 - Event `BESTSOLFOUND` is thrown before scanning the current node list and removing nodes potentially throwing the `NODEDELETE` event
 
+@section RN912 SCIP 9.1.2
+*************************
+
+Fixed bugs
+----------
+
+Unit tests
+----------
+
+Testing
+-------
+
+Build system
+------------
+
+### Cmake
+
+### Makefile
+
+Miscellaneous
+-------------
+
+Known bugs
+----------
+
 @section RN911 SCIP 9.1.1
 *************************
 

diff --git a/src/scip/scip_general.c b/src/scip/scip_general.c
@@ -95,9 +95,9 @@
 #undef SCIPhasPerformedPresolve
 #undef SCIPisStopped
 
-/** returns complete SCIP version number in the format "major . minor tech"
+/** returns SCIP version number as major + minor / 100
  *
- *  @return complete SCIP version
+ *  @return SCIP major and minor version number
  */
 SCIP_Real SCIPversion(
    void

diff --git a/src/scip/scip_general.h b/src/scip/scip_general.h
@@ -70,9 +70,9 @@ extern "C" {
  * @{
  */
 
-/** returns complete SCIP version number in the format "major . minor tech"
+/** returns SCIP version number as major + minor / 100
  *
- *  @return complete SCIP version
+ *  @return SCIP major and minor version number
  */
 SCIP_EXPORT
 SCIP_Real SCIPversion(