summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authordechuang <dechuang@multicorewareinc.com>2013-12-11 16:04:45 +0800
committerI-Jui (Ray) Sung <ray@multicorewareinc.com>2013-12-31 17:36:34 -0600
commit8f6c1c39b213df40091f3136879d15a22b9486bc (patch)
tree9af9ae641656b966c14e9093639c103fe004853e
parent377e98d21fe5058bad9891d4e3f97e5699f04909 (diff)
GPU Calc: unit test cases for DSUM
Need turn NO_FALLBACK_TO_SWINTERP on in formulagroupcl.cxx for test AMLOEXT-341 BUG Change-Id: I61f584611efaffc72b65727c2214fcd36c0e01cd Signed-off-by: haochen <haochen@multicorewareinc.com> Signed-off-by: Wei Wei <weiwei@multicorewareinc.com> Signed-off-by: I-Jui (Ray) Sung <ray@multicorewareinc.com> Signed-off-by: Wei Wei <weiwei@multicorewareinc.com>
-rw-r--r--sc/qa/unit/data/xls/opencl/database/dsum.xlsbin0 -> 31232 bytes
-rw-r--r--sc/qa/unit/opencl-test.cxx26
-rw-r--r--sc/source/core/tool/token.cxx1
3 files changed, 27 insertions, 0 deletions
diff --git a/sc/qa/unit/data/xls/opencl/database/dsum.xls b/sc/qa/unit/data/xls/opencl/database/dsum.xls
new file mode 100644
index 000000000000..a0123e261112
--- /dev/null
+++ b/sc/qa/unit/data/xls/opencl/database/dsum.xls
Binary files differ
diff --git a/sc/qa/unit/opencl-test.cxx b/sc/qa/unit/opencl-test.cxx
index cb955d548f2f..6498a822ca3a 100644
--- a/sc/qa/unit/opencl-test.cxx
+++ b/sc/qa/unit/opencl-test.cxx
@@ -254,6 +254,7 @@ public:
void testDatabaseFormulaDaverage();
void testDatabaseFormulaDstdev();
void testDatabaseFormulaDstdevp();
+ void testDatabaseFormulaDsum();
CPPUNIT_TEST_SUITE(ScOpenclTest);
CPPUNIT_TEST(testSharedFormulaXLS);
CPPUNIT_TEST(testFinacialFormula);
@@ -439,6 +440,7 @@ public:
CPPUNIT_TEST(testDatabaseFormulaDaverage);
CPPUNIT_TEST(testDatabaseFormulaDstdev);
CPPUNIT_TEST(testDatabaseFormulaDstdevp);
+ CPPUNIT_TEST(testDatabaseFormulaDsum);
CPPUNIT_TEST_SUITE_END();
private:
@@ -5132,6 +5134,30 @@ void ScOpenclTest::testDatabaseFormulaDstdevp()
xDocShRes->DoClose();
}
+//[AMLOEXT-341]
+void ScOpenclTest::testDatabaseFormulaDsum()
+{
+ if (!detectOpenCLDevice())
+ return;
+ ScDocShellRef xDocSh = loadDoc("opencl/database/dsum.", XLS);
+ ScDocument* pDoc = xDocSh->GetDocument();
+ CPPUNIT_ASSERT(pDoc);
+ enableOpenCL();
+ pDoc->CalcAll();
+ ScDocShellRef xDocShRes = loadDoc("opencl/database/dsum.", XLS);
+ ScDocument* pDocRes = xDocShRes->GetDocument();
+ CPPUNIT_ASSERT(pDocRes);
+ // Check the results of formula cells in the shared formula range.
+ for (SCROW i = 1; i <= 32; ++i)
+ {
+ double fLibre = pDoc->GetValue(ScAddress(9,i,0));
+ double fExcel = pDocRes->GetValue(ScAddress(10,i,0));
+ //CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.0001*fExcel));
+ CPPUNIT_ASSERT_DOUBLES_EQUAL(fExcel, fLibre, fabs(0.00000000001));
+ }
+ xDocSh->DoClose();
+ xDocShRes->DoClose();
+}
diff --git a/sc/source/core/tool/token.cxx b/sc/source/core/tool/token.cxx
index da3fae07934d..2ba26df8bf4e 100644
--- a/sc/source/core/tool/token.cxx
+++ b/sc/source/core/tool/token.cxx
@@ -1482,6 +1482,7 @@ void ScTokenArray::CheckToken( const FormulaToken& r )
case ocDBAverage:
case ocDBStdDev:
case ocDBStdDevP:
+ case ocDBSum:
// Don't change the state.
break;
default: