weaselab/conflict-set
2
0
Fork 0
Code Issues 4 Packages Releases 13 Activity

Fixed signed integer overflow. Closes #1

Browse Source
This commit is contained in:
Andrew Noyes
2024-01-21 17:00:40 -08:00
parent 16d46d3de6
commit b39979a471
1 changed files with 2 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ConflictSet.cpp
View File

@@ -521,13 +521,9 @@ struct Iterator {
// Call Stepwise::step for each element of remaining until it returns true. // Call Stepwise::step for each element of remaining until it returns true.
// Applies a permutation to `remaining` as a side effect. // Applies a permutation to `remaining` as a side effect.
template <class Stepwise> template <class Stepwise> void runInterleaved(std::span<Stepwise> remaining) {
void runInterleaved(std::span<Stepwise> remaining, int stepLimit = -1) {
while (remaining.size() > 0) { while (remaining.size() > 0) {
for (int i = 0; i < int(remaining.size());) { for (int i = 0; i < int(remaining.size());) {
if (stepLimit-- == 0) {
return;
}
bool done = remaining[i].step(); bool done = remaining[i].step();
if (done) { if (done) {
if (i != int(remaining.size()) - 1) { if (i != int(remaining.size()) - 1) {
@@ -542,16 +538,9 @@ void runInterleaved(std::span<Stepwise> remaining, int stepLimit = -1) {
} }
}; };
template <class Stepwise> template <class Stepwise> void runSequential(std::span<Stepwise> remaining) {
void runSequential(std::span<Stepwise> remaining, int stepLimit = -1) {
for (auto &r : remaining) { for (auto &r : remaining) {
if (stepLimit-- == 0) {
return;
}
while (!r.step()) { while (!r.step()) {
if (stepLimit-- == 0) {
return;
}
} }
} }
} }