diff options
author | Takeshi Abe <tabe@fixedpoint.jp> | 2018-10-30 18:03:10 +0900 |
---|---|---|
committer | Eike Rathke <erack@redhat.com> | 2018-11-15 22:12:01 +0100 |
commit | e22ab5e6f6b0ea49231ca454a567133996306116 (patch) | |
tree | 449d95b120c58a26ab8e0b589701c325c2579030 /sc/source | |
parent | 973a3dd9623107c18c6765d0b247aa34018a0447 (diff) |
Resolves: i#32345 Make LARGE()/SMALL() return an array
... if the second parameter is an array.
This change follows their specification in ODF 1.2.
Change-Id: I45c8923f462e9477e1234b47e39dcdd8d2198784
Reviewed-on: https://gerrit.libreoffice.org/62541
Tested-by: Jenkins
Reviewed-by: Eike Rathke <erack@redhat.com>
Diffstat (limited to 'sc/source')
-rw-r--r-- | sc/source/core/tool/interpr3.cxx | 66 |
1 files changed, 56 insertions, 10 deletions
diff --git a/sc/source/core/tool/interpr3.cxx b/sc/source/core/tool/interpr3.cxx index 2b117b2be56c..0d41e175e335 100644 --- a/sc/source/core/tool/interpr3.cxx +++ b/sc/source/core/tool/interpr3.cxx @@ -31,7 +31,9 @@ #include <scmatrix.hxx> #include <math.h> +#include <cassert> #include <memory> +#include <set> #include <vector> #include <algorithm> #include <comphelper/random.hxx> @@ -3635,29 +3637,73 @@ void ScInterpreter::CalculateSmallLarge(bool bSmall) { if ( !MustHaveParamCount( GetByte(), 2 ) ) return; - double f = ::rtl::math::approxFloor(GetDouble()); - if (f < 1.0) + + std::vector<double> aArray; + GetNumberSequenceArray(1, aArray, false); + auto aArraySize = aArray.size(); + if (aArraySize == 0 || nGlobalError != FormulaError::NONE) { - PushIllegalArgument(); + PushNoValue(); return; } - SCSIZE k = static_cast<SCSIZE>(f); + for (double fArg : aArray) + { + double f = ::rtl::math::approxFloor(fArg); + if (f < 1.0) + { + PushIllegalArgument(); + return; + } + } + + std::vector<SCSIZE> aRankArray; + aRankArray.reserve(aArraySize); + std::transform(aArray.begin(), aArray.end(), std::back_inserter(aRankArray), + [](double f) { return static_cast<SCSIZE>(f); }); + + auto itMaxRank = std::max_element(aRankArray.begin(), aRankArray.end()); + assert(itMaxRank != aRankArray.end()); + SCSIZE k = *itMaxRank; + vector<double> aSortArray; - /* TODO: using nth_element() is best for one single value, but LARGE/SMALL - * actually are defined to return an array of values if an array of - * positions was passed, in which case, depending on the number of values, - * we may or will need a real sorted array again, see #i32345. */ GetNumberSequenceArray(1, aSortArray, false ); SCSIZE nSize = aSortArray.size(); if (nSize == 0 || nGlobalError != FormulaError::NONE || nSize < k) PushNoValue(); - else + else if (aArraySize == 1) { - // TODO: the sorted case for array: PushDouble( aSortArray[ bSmall ? k-1 : nSize-k ] ); vector<double>::iterator iPos = aSortArray.begin() + (bSmall ? k-1 : nSize-k); ::std::nth_element( aSortArray.begin(), iPos, aSortArray.end()); PushDouble( *iPos); } + else + { + std::set<SCSIZE> aIndices; + for (SCSIZE n : aRankArray) + aIndices.insert(bSmall ? n-1 : nSize-n); + // We can spare sorting when the total number of ranks is small enough. + // Find only the elements at given indices if, arbitrarily, the index size is + // smaller than 1/3 of the haystack array's size; just sort it squarely, otherwise. + if (aIndices.size() < nSize/3) + { + auto itBegin = aSortArray.begin(); + for (SCSIZE i : aIndices) + { + auto it = aSortArray.begin() + i; + std::nth_element(itBegin, it, aSortArray.end()); + itBegin = ++it; + } + } + else + std::sort(aSortArray.begin(), aSortArray.end()); + + aArray.clear(); + for (SCSIZE n : aRankArray) + aArray.push_back(aSortArray[bSmall ? n-1 : nSize-n]); + ScMatrixRef pResult = GetNewMat(1, aArraySize, true); + pResult->PutDoubleVector(aArray, 0, 0); + PushMatrix(pResult); + } } void ScInterpreter::ScLarge() |