nmelone/GoldenCheetah
1
0
Fork 0
mirror of https://github.com/GoldenCheetah/GoldenCheetah.git synced 2026-04-13 12:42:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

DataFilter vectors - vectorize = <> < <= > >= operations

Browse Source 
Similar to b24869e for relational operators
Fixes #4856
This commit is contained in:
Alejandro Martinez
2026-04-06 19:05:44 -03:00
parent efe680c9a5
commit 11ce6f8f72
1 changed files with 44 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

73
src/Core/DataFilter.cpp
View File

@@ -8259,42 +8259,57 @@ Result Leaf::eval(DataFilterRuntime *df, Leaf *leaf, const Result &x, long it, R
}
break;
// relational operations should all work with vectors or scalars
case EQ:
{
if (lhs.isNumber) return Result(lhs.number() == rhs.number());
else return Result(lhs.string() == rhs.string());
}
break;
case NEQ:
{
if (lhs.isNumber) return Result(lhs.number() != rhs.number());
else return Result(lhs.string() != rhs.string());
}
break;
case LT:
{
if (lhs.isNumber) return Result(lhs.number() < rhs.number());
else return Result(lhs.string() < rhs.string());
}
break;
case LTE:
{
if (lhs.isNumber) return Result(lhs.number() <= rhs.number());
else return Result(lhs.string() <= rhs.string());
}
break;
case GT:
{
if (lhs.isNumber) return Result(lhs.number() > rhs.number());
else return Result(lhs.string() > rhs.string());
}
break;
case GTE:
{
if (lhs.isNumber) return Result(lhs.number() >= rhs.number());
else return Result(lhs.string() >= rhs.string());
if (lhs.isVector() || rhs.isVector()) {
Result returning(0);
// coerce both into a vector of matching size
int size = std::max(lhs.isNumber ? lhs.asNumeric().count() : lhs.asString().count(),
rhs.isNumber ? rhs.asNumeric().count() : rhs.asString().count());
lhs.vectorize(size);
rhs.vectorize(size);
for(int i=0; i<size; i++) {
double value = 0;
switch (leaf->op) {
case EQ: value = lhs.isNumber ? lhs.number() == rhs.number() : lhs.string() == rhs.string(); break;
case NEQ: value = lhs.isNumber ? lhs.number() != rhs.number() : lhs.string() != rhs.string(); break;
case LT: value = lhs.isNumber ? lhs.number() < rhs.number() : lhs.string() < rhs.string(); break;
case LTE: value = lhs.isNumber ? lhs.number() <= rhs.number() : lhs.string() <= rhs.string(); break;
case GT: value = lhs.isNumber ? lhs.number() > rhs.number() : lhs.string() > rhs.string(); break;
case GTE: value = lhs.isNumber ? lhs.number() >= rhs.number() : lhs.string() >= rhs.string(); break;
}
returning.asNumeric() << value;
returning.number() += value;
}
return returning;
} else {
switch (leaf->op) {
case EQ: if (lhs.isNumber) return Result(lhs.number() == rhs.number());
else return Result(lhs.string() == rhs.string());
case NEQ: if (lhs.isNumber) return Result(lhs.number() != rhs.number());
else return Result(lhs.string() != rhs.string());
case LT: if (lhs.isNumber) return Result(lhs.number() < rhs.number());
else return Result(lhs.string() < rhs.string());
case LTE: if (lhs.isNumber) return Result(lhs.number() <= rhs.number());
else return Result(lhs.string() <= rhs.string());
case GT: if (lhs.isNumber) return Result(lhs.number() > rhs.number());
else return Result(lhs.string() > rhs.string());
case GTE: if (lhs.isNumber) return Result(lhs.number() >= rhs.number());
else return Result(lhs.string() >= rhs.string());
}
}
}
break;