diff --git a/CHANGELOG b/CHANGELOG index e6c37b911a..0abb174fa0 100644 --- a/CHANGELOG +++ b/CHANGELOG @@ -151,6 +151,11 @@ Interface changes Fixed bugs ---------- +Miscellaneous +------------- + +- updated description of paramater misc/usesymmetry + @section RN921 SCIP 9.2.1 ************************* diff --git a/src/scip/set.c b/src/scip/set.c index 9d1ab83971..f41b657e14 100644 --- a/src/scip/set.c +++ b/src/scip/set.c @@ -306,10 +306,10 @@ #define SCIP_DEFAULT_MISC_ALLOWSTRONGDUALREDS TRUE /**< should strong dual reductions be allowed in propagation and presolving? */ #define SCIP_DEFAULT_MISC_ALLOWWEAKDUALREDS TRUE /**< should weak dual reductions be allowed in propagation and presolving? */ #define SCIP_DEFAULT_MISC_REFERENCEVALUE 1e99 /**< objective value for reference purposes */ -#define SCIP_DEFAULT_MISC_USESYMMETRY 7 /**< bitset describing used symmetry handling technique (0: off; 1: polyhedral (orbitopes and/or symresacks) - * 2: orbital fixing; 3: orbitopes and orbital fixing; 4: Schreier Sims cuts; 5: Schreier Sims cuts and - * orbitopes); 6: Schreier Sims cuts and orbital fixing; 7: Schreier Sims cuts, orbitopes, and orbital - * fixing, see type_symmetry.h */ +#define SCIP_DEFAULT_MISC_USESYMMETRY 7 /**< bitset describing used symmetry handling technique (0: off; 1: polyhedral (orbitopes and symresacks, lexicographic and orbitopal reduction if dynamic) + * 2: orbital reduction; 3: polyhedral methods and orbital reduction; 4: Schreier Sims cuts; 5: Schreier Sims cuts and polyhedral + * methods); 6: Schreier Sims cuts and orbital reduction; 7: Schreier Sims cuts, polyhedral methods, and orbital + * reduction, see type_symmetry.h */ #define SCIP_DEFAULT_MISC_SCALEOBJ TRUE /**< should the objective function be scaled? */ #define SCIP_DEFAULT_MISC_SHOWDIVINGSTATS FALSE /**< should detailed statistics for diving heuristics be shown? */ @@ -2064,13 +2064,13 @@ SCIP_RETCODE SCIPsetCreate( "misc/usesymmetry", "bitset describing used symmetry handling technique: " \ "(0: off; " \ - "1: constraint-based (orbitopes and/or symresacks); " \ - "2: orbital fixing; " \ - "3: orbitopes and orbital fixing; " \ + "1: constraint-based (orbitopes, symresacks); lexicographic and orbitopal reduction) if dynamic; " \ + "2: orbital reduction; " \ + "3: orbitopes and symresacks, and lexicographic/orbital reduction; " \ "4: Schreier Sims cuts; " \ - "5: Schreier Sims cuts and orbitopes; " \ - "6: Schreier Sims cuts and orbital fixing; " \ - "7: Schreier Sims cuts, orbitopes, and orbital fixing) " \ + "5: Schreier Sims cuts, orbitopes, symresacks, and/or lexicographic reduction; " \ + "6: Schreier Sims cuts, orbital reduction; " \ + "7: Schreier Sims cuts, orbitopes, symresacks, and/or lexicographic/orbital reduction;) " \ "See type_symmetry.h.", &(*set)->misc_usesymmetry, FALSE, SCIP_DEFAULT_MISC_USESYMMETRY, 0, 7, paramChgdUsesymmetry, NULL) ); diff --git a/src/symmetry/type_symmetry.h b/src/symmetry/type_symmetry.h index 50de94f4a8..c8efaf053b 100644 --- a/src/symmetry/type_symmetry.h +++ b/src/symmetry/type_symmetry.h @@ -96,7 +96,8 @@ typedef enum SYM_Consoptype SYM_CONSOPTYPE; /* type of symmetry handling codes */ #define SYM_HANDLETYPE_NONE UINT32_C(0x00000000) /**< no symmetry handling */ -#define SYM_HANDLETYPE_SYMBREAK UINT32_C(0x00000001) /**< symmetry breaking inequalities */ +#define SYM_HANDLETYPE_SYMBREAK UINT32_C(0x00000001) /**< symmetry breaking inequalities (orbitopes/ + * orbisacks/symresacks) and lexicographic reduction */ #define SYM_HANDLETYPE_ORBITALREDUCTION UINT32_C(0x00000002) /**< orbital reduction */ #define SYM_HANDLETYPE_SST UINT32_C(0x00000004) /**< Schreier Sims cuts */ #define SYM_HANDLETYPE_SYMCONS (SYM_HANDLETYPE_SYMBREAK | SYM_HANDLETYPE_SST)