Merge branch 'correct-inconsistencies' into 'v90-bugfix'

Correct inconsistencies See merge request integer/scip!3369
scipopt · Apr 9, 2024 · 76343c3 · 76343c3
2 parents 13756ff + db96482
commit 76343c3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -43,6 +43,18 @@ Build system
 
 - add flags -ffp-contract=off and /fp:precise to enhance reproducibility across different systems
 
+Interface changes
+-----------------
+
+### New parameters
+
+- added parameter "propagating/symmetry/symtiming" to determine when symmetries are computed and handled
+
+### Changed parameters
+
+- Disabled "propagating/symmetry/addconsstiming" since it is not used anymore.
+- Disabled "propagating/symmetry/ofsymcomptiming" since it is not used anymore.
+
 @section RN900 SCIP 9.0.0
 *************************
 
@@ -221,8 +233,6 @@ Interface changes
 - Disabled "propagating/symmetry/performpresolving" since running orbital reduction during presolving is not effective.
 - Repurposed "propagating/symmetry/usedynamicprop" since it now also applies to lexicographic reduction.
 - Changed default value of parameter "propagating/symmetry/addsymresacks" from FALSE to TRUE.
-- Disabled "propagating/symmetry/addconsstiming" since it is not used anymore.
-- Disabled "propagating/symmetry/ofsymcomptiming" since it is not used anymore.
 
 ### New parameters
 
@@ -263,7 +273,6 @@ Interface changes
 - separating/lagromory/varconsratiothreshold to denote the minimum variable-constraint ratio on the optimal face for the
   separator execution
 - many other advanced parameters for the Lagromory separator, which are also mentioned under separating/lagromory/*
-- added parameter "propagating/symmetry/symtiming" to determine when symmetries are computed and handled
 
 ### Data structures
 

diff --git a/src/symmetry/type_symmetry.h b/src/symmetry/type_symmetry.h
@@ -51,6 +51,10 @@ typedef uint32_t SYM_SPEC;              /**< types of variables handled by symme
 #define SYM_TIMING_DURINGPRESOL    1         /**< compute and handle symmetries during presolving */
 #define SYM_TIMING_AFTERPRESOL     2         /**< compute and handle symmetries after presolving */
 
+#define SYM_COMPUTETIMING_BEFOREPRESOL    SYM_TIMING_BEFOREPRESOL  /**< compute symmetries before presolving */
+#define SYM_COMPUTETIMING_DURINGPRESOL    SYM_TIMING_DURINGPRESOL  /**< compute symmetries during presolving */
+#define SYM_COMPUTETIMING_AFTERPRESOL     SYM_TIMING_AFTERPRESOL   /**< compute symmetries after presolving */
+
 /** define symmetry types detectable by SCIP */
 enum SYM_Symtype
 {