Skip to content

Commit 65b923e

Browse files
committed
Merge branch 'fix_groupsize_dejavu' into 'master'
fix group size computation for dejavu See merge request integer/scip!3847
2 parents c183dab + f53c983 commit 65b923e

File tree

2 files changed

+6
-3
lines changed

2 files changed

+6
-3
lines changed

src/symmetry/compute_symmetry_sassy_bliss.cpp

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -327,7 +327,8 @@ SCIP_RETCODE computeAutomorphisms(
327327
}
328328

329329
/* determine log10 of symmetry group size */
330-
*log10groupsize = (SCIP_Real) log10l(stats.get_group_size_approx()) + (SCIP_Real) sassy.exp;
330+
dejavu::big_number grp_sz = sassy.grp_sz;
331+
*log10groupsize = (SCIP_Real) log10l(stats.get_group_size_approx() * grp_sz.mantissa * powl(10.0, (SCIP_Real) grp_sz.exponent));
331332

332333
return SCIP_OKAY;
333334
}

src/symmetry/compute_symmetry_sassy_nauty.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -378,7 +378,8 @@ SCIP_RETCODE computeAutomorphisms(
378378
*log10groupsize = 0.0;
379379
if(sg.nv > 0) {
380380
sparsenauty(&sg, lab, ptn, orbits, &options, &stats, NULL);
381-
*log10groupsize = log10(stats.grpsize1 * pow(10.0, (SCIP_Real) (stats.grpsize2 + sassy.exp)));
381+
dejavu::big_number grp_sz = sassy.grp_sz;
382+
*log10groupsize = log10(stats.grpsize1 * grp_sz.mantissa * pow(10.0, (SCIP_Real) (stats.grpsize2 + grp_sz.exponent)));
382383
}
383384
#else
384385
convert_dejavu_to_traces(&sassygraph, &sg, &lab, &lab_sz, &ptn, &ptn_sz);
@@ -392,7 +393,8 @@ SCIP_RETCODE computeAutomorphisms(
392393
options.defaultptn = FALSE; /* use color classes */
393394
if(sg.nv > 0) {
394395
Traces(&sg, lab, ptn, orbits, &options, &stats, NULL);
395-
*log10groupsize = log10(stats.grpsize1 * pow(10.0, (SCIP_Real) (stats.grpsize2 + sassy.exp)));
396+
dejavu::big_number grp_sz = sassy.grp_sz;
397+
*log10groupsize = log10(stats.grpsize1 * grp_sz.mantissa * pow(10.0, (SCIP_Real) (stats.grpsize2 + grp_sz.exponent)));
396398
}
397399
#endif
398400

0 commit comments

Comments
 (0)