UpsilonNumworks/Upsilon
1
0
Fork 0
mirror of https://github.com/UpsilonNumworks/Upsilon.git synced 2026-01-19 00:37:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

[apps/shared/expression_model_store] Harmonize recordSatisfyingTestAtIndex and numberOfModelsSatisfyingTest

Browse Source
This commit is contained in:
Ruben Dashyan
2019-09-10 10:11:10 +02:00
committed by LeaNumworks
parent d4e129e162
commit 9bbc4233f8
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
apps/shared/expression_model_store.cpp
View File

@@ -41,37 +41,37 @@ void ExpressionModelStore::tidy() {
}
int ExpressionModelStore::numberOfModelsSatisfyingTest(ModelTest test) const {
int result = 0;
int i = 0;
int count = 0;
int index = 0;
do {
ExpressionModelHandle * m = privateModelForRecord(recordAtIndex(i++));
ExpressionModelHandle * m = privateModelForRecord(recordAtIndex(index++));
if (m->isNull()) {
break;
}
if (test(m)) {
result++;
count++;
}
} while (true);
return result;
return count;
}
Ion::Storage::Record ExpressionModelStore::recordSatisfyingTestAtIndex(int i, ModelTest test) const {
assert(0 <= i && i < numberOfModelsSatisfyingTest(test));
int count = 0;
int index = 0;
int currentModelIndex = 0;
Ion::Storage::Record record;
do {
record = recordAtIndex(currentModelIndex++);
record = recordAtIndex(index++);
ExpressionModelHandle * m = privateModelForRecord(record);
if (m->isNull()) {
assert(false);
break;
}
if (test(m)) {
if (i == index) {
if (i == count) {
break;
}
index++;
count++;
}
} while (true);
return record;