Skip to content

Commit 4723cfd

Browse files
committed
Merge remote-tracking branch 'origin/v92-bugfix' into v9-minor
2 parents 7b45648 + e2f6c30 commit 4723cfd

File tree

3 files changed

+4
-3
lines changed

3 files changed

+4
-3
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,7 @@ Fixed bugs
5555
- declare infinite bound inference infeasible in SCIPinferVarLbCons() and SCIPinferVarUbCons() to maintain correct loose LP values
5656
- fixed update of consssorted flags in a variable expressions data when adding an additional constraint using this variable
5757
- corrected computation of number of variables affected by symmetry
58+
- fixed computation of symmetry group size
5859

5960
Build system
6061
------------

src/symmetry/compute_symmetry_sassy_bliss.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -361,7 +361,7 @@ SCIP_RETCODE computeAutomorphisms(
361361
}
362362

363363
/* determine log10 of symmetry group size */
364-
*log10groupsize = (SCIP_Real) log10l(stats.get_group_size_approx()) + (SCIP_Real) sassy.exp;
364+
*log10groupsize = (SCIP_Real) log10l(stats.get_group_size_approx() * sassy.base) + (SCIP_Real) sassy.exp;
365365

366366
return SCIP_OKAY;
367367
}

src/symmetry/compute_symmetry_sassy_nauty.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -395,7 +395,7 @@ SCIP_RETCODE computeAutomorphisms(
395395
*log10groupsize = 0.0;
396396
if(sg.nv > 0) {
397397
sparsenauty(&sg, lab, ptn, orbits, &options, &stats, NULL);
398-
*log10groupsize = log10(stats.grpsize1 * pow(10.0, (SCIP_Real) (stats.grpsize2 + sassy.exp)));
398+
*log10groupsize = log10(stats.grpsize1 * sassy.base * pow(10.0, (SCIP_Real) (stats.grpsize2 + sassy.exp)));
399399
}
400400
#else
401401
convert_sassy_to_traces(&sassygraph, &sg, &lab, &lab_sz, &ptn, &ptn_sz);
@@ -409,7 +409,7 @@ SCIP_RETCODE computeAutomorphisms(
409409
options.defaultptn = FALSE; /* use color classes */
410410
if(sg.nv > 0) {
411411
Traces(&sg, lab, ptn, orbits, &options, &stats, NULL);
412-
*log10groupsize = log10(stats.grpsize1 * pow(10.0, (SCIP_Real) (stats.grpsize2 + sassy.exp)));
412+
*log10groupsize = log10(stats.grpsize1 * sassy.base * pow(10.0, (SCIP_Real) (stats.grpsize2 + sassy.exp)));
413413
}
414414
#endif
415415

0 commit comments

Comments
 (0)