Merge branch 'fix-objlim-issue-sepa_aggregation' into 'v91-bugfix'

only round down objective if integer

See merge request integer/scip!3442

Author: leoneifler

CHANGELOG

@@ -6,6 +6,8 @@
 Fixed bugs
 ----------
 
+- fix bug in separator aggregation that caused incorrect terminations when for an integral objective the objective limit was set to a fractional value
+
 Performance improvements
 ------------------------
 

check/CMakeLists.txt

@@ -463,6 +463,10 @@ set(instances_Or
     "instances/Or/problem.cip\;0"
     )
 
+set(instances_Objlim
+    "instances/Issue/3715.cip\;0\;default\;0.01"
+    )
+
 #
 # Pairs of instances and settings
 #
@@ -536,6 +540,14 @@ macro(split_decompinstance instance)
     get_filename_component(basename ${instpath} NAME)
 endmacro(split_decompinstance)
 
+macro(split_objliminstance instance)
+    list(GET instance 0 path)
+    list(GET instance 1 optval)
+    list(GET instance 2 setting)
+    list(GET instance 3 objlim)
+    get_filename_component(basename ${path} NAME)
+endmacro(split_objliminstance)
+
 macro(split_pair pair)
     list(GET pair 0 path)
     list(GET pair 1 optval)
@@ -695,6 +707,26 @@ foreach(instance ${instances_Indicator})
         )
 endforeach(instance)
 
+#
+# test checking objectivelimits
+#
+foreach(instance ${instances_Objlim})
+    split_objliminstance(instance)
+    #
+    # configure the batch file for this test by substituting placeholders in the in.file
+    #
+    configure_file(interactiveshell/objectivelimit.bat.in interactiveshell/objectivelimit-${basename}.bat)
+    add_test(NAME Objlim-${setting}-${basename}
+            COMMAND $<TARGET_FILE:scip> -b ${PROJECT_BINARY_DIR}/check/interactiveshell/objectivelimit-${basename}.bat
+            )
+    set_tests_properties(Objlim-${setting}-${basename}
+        PROPERTIES
+            PASS_REGULAR_EXPRESSION "Validation         : Success"
+            FAIL_REGULAR_EXPRESSION ERROR
+            DEPENDS scip-build
+        )
+endforeach(instance)
+
 #
 # the following instances are not pure binary and hence cannot be written out in opb format
 #