Skip to content

Commit 8d48b2d

Browse files
author
Christopher Hojny
committed
Merge branch 'correct-computation-number-of-affected-symvars' into 'v92-bugfix'
corrected computation of #affected symvars See merge request integer/scip!3852
2 parents 6487853 + ee3d324 commit 8d48b2d

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

CHANGELOG

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ Fixed bugs
1212
- disable objective limit during lexicographic dual minimization to keep feasibility status
1313
- declare infinite bound inference infeasible in SCIPinferVarLbCons() and SCIPinferVarUbCons() to maintain correct loose LP values
1414
- fixed update of consssorted flags in a variable expressions data when adding an additional constraint using this variable
15+
- corrected computation of number of variables affected by symmetry
1516

1617
Build system
1718
------------

src/scip/prop_symmetry.c

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2052,9 +2052,9 @@ SCIP_RETCODE ensureSymmetryMovedpermvarscountsComputed(
20522052
propdata->nmovedimplintpermvars = 0;
20532053
propdata->nmovedcontpermvars = 0;
20542054

2055-
for (p = 0; p < propdata->nperms; ++p)
2055+
for (v = 0; v < propdata->npermvars; ++v)
20562056
{
2057-
for (v = 0; v < propdata->npermvars; ++v)
2057+
for (p = 0; p < propdata->nperms; ++p)
20582058
{
20592059
if ( propdata->perms[p][v] != v )
20602060
{
@@ -2078,6 +2078,7 @@ SCIP_RETCODE ensureSymmetryMovedpermvarscountsComputed(
20782078
SCIPerrorMessage("Variable provided with unknown vartype\n");
20792079
return SCIP_ERROR;
20802080
}
2081+
break;
20812082
}
20822083
}
20832084
}

0 commit comments

Comments
 (0)