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

Author: scip-ci

src/scip/prop_symmetry.c

@@ -2498,7 +2498,7 @@ SCIP_RETCODE determineSymmetry(
       SCIPverbMessage(scip, SCIP_VERBLEVEL_HIGH, NULL, "%d", maxgenerators);
 
    /* display statistics: log10 group size, number of affected vars*/
-   SCIPverbMessage(scip, SCIP_VERBLEVEL_HIGH, NULL, ", log10 of symmetry group size: %.1f", propdata->log10groupsize);
+   SCIPverbMessage(scip, SCIP_VERBLEVEL_HIGH, NULL, ", log10 of symmetry group size: %.2f", propdata->log10groupsize);
 
    if ( propdata->displaynorbitvars )
    {

src/symmetry/compute_symmetry_nauty.c

@@ -1388,7 +1388,7 @@ SCIP_RETCODE SYMcomputeSymmetryGenerators(
    }
 
    /* determine log10 of symmetry group size */
-   *log10groupsize = (SCIP_Real) stats.grpsize2;
+   *log10groupsize = log10(stats.grpsize1 * pow(10.0, (SCIP_Real) stats.grpsize2));
 
    return SCIP_OKAY;
 }

src/symmetry/compute_symmetry_sassy_bliss.cpp

@@ -327,7 +327,7 @@ SCIP_RETCODE computeAutomorphisms(
    }
 
    /* determine log10 of symmetry group size */
-   *log10groupsize = (SCIP_Real) log10l(stats.get_group_size_approx());
+   *log10groupsize = (SCIP_Real) log10l(stats.get_group_size_approx()) + (SCIP_Real) sassy.exp;
 
    return SCIP_OKAY;
 }

src/symmetry/compute_symmetry_sassy_nauty.cpp

@@ -378,7 +378,7 @@ SCIP_RETCODE computeAutomorphisms(
    *log10groupsize = 0.0;
    if(sg.nv > 0) {
       sparsenauty(&sg, lab, ptn, orbits, &options, &stats, NULL);
-      *log10groupsize = (SCIP_Real) stats.grpsize2;
+      *log10groupsize = log10(stats.grpsize1 * pow(10.0, (SCIP_Real) (stats.grpsize2 + sassy.exp)));
    }
 #else
    convert_dejavu_to_traces(&sassygraph, &sg, &lab, &lab_sz, &ptn, &ptn_sz);
@@ -392,6 +392,7 @@ SCIP_RETCODE computeAutomorphisms(
    options.defaultptn = FALSE; /* use color classes */
    if(sg.nv > 0) {
       Traces(&sg, lab, ptn, orbits, &options, &stats, NULL);
+      *log10groupsize = log10(stats.grpsize1 * pow(10.0, (SCIP_Real) (stats.grpsize2 + sassy.exp)));
    }
 #endif