TDE
/
koffice
mirror of https://mirror.git.trinitydesktop.org/gitea/TDE/koffice
0
0
Fork 0
Code Issues Releases Wiki Activity

Compare commits

base: TDE:c0bcd64f7fce74db2ef792e73ed5eceb079fd64f
Branches Tags
TDE:master
TDE:r14.1.x
TDE:r14.0.x
TDE:v3.5.13-sru
...
compare: TDE:76f5e81662ade526958e24dee91adaf03a294c72
Branches Tags
TDE:master
TDE:r14.1.x
TDE:r14.0.x
TDE:v3.5.13-sru

2 Commits
c0bcd64f7f ... 76f5e81662

Author SHA1 Message Date
Mavridis Philippe 76f5e81662 KSpread: New lookup/reference functions
1 month ago
Mavridis Philippe 4f21f4038f KSpread: Add natural comparison operators.
1 month ago
4 changed files with 202 additions and 5 deletions
Show Stats

54
kspread/extensions/reference.xml
Unescape View File

@ -201,7 +201,59 @@
<Example>LOOKUP(1.232; A1:A6; B1:B6) for A1 = 1, A2 = 2 returns the value of B1.</Example>
</Help>
</Function>
<Function>
<Name>HLOOKUP</Name>
<Type>String/Numeric</Type>
<Parameter>
<Comment>Lookup value</Comment>
<Type>String/Numeric</Type>
</Parameter>
<Parameter>
<Comment>Data source</Comment>
<Type>Array</Type>
</Parameter>
<Parameter>
<Comment>Row</Comment>
<Type>Int</Type>
</Parameter>
<Parameter>
<Comment>Sorted (optional)</Comment>
<Type>Boolean</Type>
</Parameter>
<Help>
<Text>Look for a matching value in the first row of the given table, and return the value of the indicated row.</Text>
<Text>Looks up the 'lookup value' in the first row of the 'data source'. If a value matches, the value in the 'row' and the column, the value was found in, is returned. If 'sorted' is true (default), the first row is assumed to be sorted. The search will end, if the 'lookup value' is lower than the value, currently compared to.</Text>
<Syntax>HLOOKUP(Lookup value; data source; Row; Sorted)</Syntax>
</Help>
</Function>
<Function>
<Name>VLOOKUP</Name>
<Type>String/Numeric</Type>
<Parameter>
<Comment>Lookup value</Comment>
<Type>String/Numeric</Type>
</Parameter>
<Parameter>
<Comment>Data source</Comment>
<Type>Array</Type>
</Parameter>
<Parameter>
<Comment>Column</Comment>
<Type>Int</Type>
</Parameter>
<Parameter>
<Comment>Sorted (optional)</Comment>
<Type>Boolean</Type>
</Parameter>
<Help>
<Text>Look for a matching value in the first column of the given table, and return the value of the indicated column.</Text>
<Text>Looks up the 'lookup value' in the first column of the 'data source'. If a value matches, the value in the 'column' and the row, the value was found in, is returned. If 'sorted' is true (default), the first column is assumed to be sorted. The search will end, if the 'lookup value' is lower than the value, currently compared to.</Text>
<Syntax>VLOOKUP(Lookup value; data source; Column; Sorted)</Syntax>
</Help>
</Function>
</Group>
</KSpreadFunctions>

71
kspread/kspread_functions_reference.cpp
Unescape View File

@ -38,11 +38,13 @@ Value func_areas (valVector args, ValueCalc *calc, FuncExtra *);
Value func_choose (valVector args, ValueCalc *calc, FuncExtra *);
Value func_column (valVector args, ValueCalc *calc, FuncExtra *);
Value func_columns (valVector args, ValueCalc *calc, FuncExtra *);
Value func_hlookup (valVector args, ValueCalc *calc, FuncExtra *);
Value func_index (valVector args, ValueCalc *calc, FuncExtra *);
Value func_indirect (valVector args, ValueCalc *calc, FuncExtra *);
Value func_lookup (valVector args, ValueCalc *calc, FuncExtra *);
Value func_row (valVector args, ValueCalc *calc, FuncExtra *);
Value func_rows (valVector args, ValueCalc *calc, FuncExtra *);
Value func_vlookup (valVector args, ValueCalc *calc, FuncExtra *);
// registers all reference functions
void RegisterReferenceFunctions()
@ -69,6 +71,10 @@ void RegisterReferenceFunctions()
f->setAcceptArray ();
f->setNeedsExtra (true);
repo->add (f);
f = new Function ("HLOOKUP", func_hlookup);
f->setParamCount (3, 4);
f->setAcceptArray ();
repo->add (f);
f = new Function ("INDEX", func_index);
f->setParamCount (3);
f->setAcceptArray ();
@ -89,6 +95,10 @@ void RegisterReferenceFunctions()
f->setAcceptArray ();
f->setNeedsExtra (true);
repo->add (f);
f = new Function ("VLOOKUP", func_vlookup);
f->setParamCount (3, 4);
f->setAcceptArray ();
repo->add (f);
}
// Function: ADDRESS
@ -225,6 +235,36 @@ Value func_choose (valVector args, ValueCalc *calc, FuncExtra *)
return args[num];
}
// Function: HLOOKUP
Value func_hlookup (valVector args, ValueCalc *calc, FuncExtra *)
{
const Value key = args[0];
const Value data = args[1];
const int row = calc->conv()->asInteger( args[2] ).asInteger();
const int cols = data.columns();
const int rows = data.rows();
if ( row < 1 || row > rows )
return Value::errorVALUE();
const bool rangeLookup = ( args.count() > 3 ) ? calc->conv()->asBoolean( args[3] ).asBoolean() : true;
// now traverse the array and perform comparison
Value r;
Value v = Value::errorNA();
for (int col = 0; col < cols; ++col) {
// search in the first row
const Value le = data.element(col, 0);
if (calc->naturalEqual(key, le)) {
return data.element(col, row - 1);
}
// optionally look for the next largest value that is less than key
if (rangeLookup && calc->naturalLower(le, key) && calc->naturalLower(r, le)) {
r = le;
v = data.element(col, row - 1);
}
}
return v;
}
// Function: INDEX
Value func_index (valVector args, ValueCalc *calc, FuncExtra *)
{
@ -232,7 +272,7 @@ Value func_index (valVector args, ValueCalc *calc, FuncExtra *)
// value, or a single cell containing an array - then we return the array
// element. In any case, this function can assume that the given value
// is the same. Because it is.
Value val = args[0];
unsigned row = calc->conv()->asInteger (args[1]).asInteger() - 1;
unsigned col = calc->conv()->asInteger (args[2]).asInteger() - 1;
@ -340,3 +380,32 @@ Value func_indirect (valVector args, ValueCalc *calc, FuncExtra *e)
return Value::errorVALUE();
}
// Function: VLOOKUP
Value func_vlookup (valVector args, ValueCalc *calc, FuncExtra *)
{
const Value key = args[0];
const Value data = args[1];
const int col = calc->conv()->asInteger(args[2]).asInteger();
const int cols = data.columns();
const int rows = data.rows();
if (col < 1 || col > cols)
return Value::errorVALUE();
const bool rangeLookup = (args.count() > 3) ? calc->conv()->asBoolean(args[3]).asBoolean() : true;
// now traverse the array and perform comparison
Value r;
Value v = Value::errorNA();
for (int row = 0; row < rows; ++row) {
// search in the first column
const Value le = data.element(0, row);
if (calc->naturalEqual(key, le)) {
return data.element(col - 1, row);
}
// optionally look for the next largest value that is less than key
if (rangeLookup && calc->naturalLower(le, key) && calc->naturalLower(r, le)) {
r = le;
v = data.element(col - 1, row);
}
}
return v;
}

65
kspread/valuecalc.cpp
Unescape View File

@ -433,9 +433,70 @@ bool ValueCalc::approxEqual (const Value &a, const Value &b)
return (x < 0.0 ? -x : x) < ((aa < 0.0 ? -aa : aa) * DBL_EPSILON);
}
bool ValueCalc::strEqual (const Value &a, const Value &b)
bool ValueCalc::strEqual (const Value &a, const Value &b, bool CS)
{
return (converter->asString (a).asString() == converter->asString (b).asString());
TQString aa = converter->asString(a).asString();
TQString bb = converter->asString(b).asString();
if (!CS) {
aa = aa.lower();
bb = bb.lower();
}
return (aa == bb);
}
bool ValueCalc::strGreater (const Value &a, const Value &b, bool CS)
{
TQString aa = converter->asString(a).asString();
TQString bb = converter->asString(b).asString();
if (!CS) {
aa = aa.lower();
bb = bb.lower();
}
return (aa > bb);
}
bool ValueCalc::strGequal (const Value &a, const Value &b, bool CS)
{
TQString aa = converter->asString(a).asString();
TQString bb = converter->asString(b).asString();
if (!CS) {
aa = aa.lower();
bb = bb.lower();
}
return (aa >= bb);
}
bool ValueCalc::strLower (const Value &a, const Value &b, bool CS)
{
return strGreater (b, a, CS);
}
bool ValueCalc::naturalEqual (const Value &a, const Value &b, bool CS)
{
if (a.isNumber() && b.isNumber())
return approxEqual(a, b);
if (a.allowComparison(b))
return a.equal(b);
return strEqual(a, b, CS);
}
bool ValueCalc::naturalGreater (const Value &a, const Value &b, bool CS)
{
if (a.isNumber() && b.isNumber())
return greater(a, b);
if (a.allowComparison(b))
return a.greater(b);
return strGreater(a, b, CS);
}
bool ValueCalc::naturalGequal (const Value &a, const Value &b, bool CS)
{
return naturalGreater(a, b, CS) || naturalEqual(a, b, CS);
}
bool ValueCalc::naturalLower (const Value &a, const Value &b, bool CS)
{
return naturalGreater(b, a, CS);
}
bool ValueCalc::greater (const Value &a, const Value &b)

17
kspread/valuecalc.h
Unescape View File

@ -106,7 +106,22 @@ class ValueCalc {
/** numerical comparison */
bool lower (const Value &a, const Value &b);
/** string comparison */
bool strEqual (const Value &a, const Value &b);
bool strEqual (const Value &a, const Value &b, bool CS = true);
/** string comparison */
bool strGreater (const Value &a, const Value &b, bool CS = true);
/** string comparison - greater or equal */
bool strGequal (const Value &a, const Value &b, bool CS = true);
/** string comparison */
bool strLower (const Value &a, const Value &b, bool CS = true);
/** string or numerical comparison */
bool naturalEqual (const Value &a, const Value &b, bool CS = true);
/** string or numerical comparison */
bool naturalGreater (const Value &a, const Value &b, bool CS = true);
/** string or numerical comparison - greater or equal */
bool naturalGequal (const Value &a, const Value &b, bool CS = true);
/** string or numerical comparison */
bool naturalLower (const Value &a, const Value &b, bool CS = true);
int sign (const Value &a);
/** rounding */

Write Preview
Loading…
Cancel
Save