diff options
| author | mulei <mulei@multicorewareinc.com> | 2013-12-03 11:03:54 +0800 |
|---|---|---|
| committer | I-Jui (Ray) Sung <ray@multicorewareinc.com> | 2013-12-18 20:34:51 -0600 |
| commit | 54e7aedafc207105290762c2233aad737b552e98 (patch) | |
| tree | a2ad6f5693ebb928f007abf156565dc5376cbc4d | |
| parent | ea85561eb725eebf44fa10046567c33de5984679 (diff) | |
GPU Calc: Optimized NPER
AMLOEXT-251
Change-Id: Ifb4505158eccdab2ae95e4568c862ddfe8ec613c
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>
| -rw-r--r-- | sc/source/core/opencl/op_financial.cxx | 48 |
1 files changed, 6 insertions, 42 deletions
diff --git a/sc/source/core/opencl/op_financial.cxx b/sc/source/core/opencl/op_financial.cxx index 3d93721a9d30..e84d632902f0 100644 --- a/sc/source/core/opencl/op_financial.cxx +++ b/sc/source/core/opencl/op_financial.cxx @@ -3203,44 +3203,7 @@ void OpNper::GenSlidingWindowFunction(std::stringstream &ss, { FormulaToken *pCur = vSubArguments[i]->GetFormulaToken(); assert(pCur); - if (pCur->GetType() == formula::svDoubleVectorRef) - { - const formula::DoubleVectorRefToken* pDVR = - dynamic_cast<const formula::DoubleVectorRefToken *>(pCur); - size_t nCurWindowSize = pDVR->GetRefRowSize(); - ss << " for (int i = "; - if (!pDVR->IsStartFixed() && pDVR->IsEndFixed()) { -#ifdef ISNAN - ss << "gid0; i < " << pDVR->GetArrayLength(); - ss << " && i < " << nCurWindowSize << "; i++){\n"; -#else - ss << "gid0; i < "<< nCurWindowSize << "; i++)\n"; -#endif - } else if (pDVR->IsStartFixed() && !pDVR->IsEndFixed()) { -#ifdef ISNAN - ss << "0; i < " << pDVR->GetArrayLength(); - ss << " && i < gid0+"<< nCurWindowSize << "; i++){\n"; -#else - ss << "0; i < gid0+"<< nCurWindowSize << "; i++)\n"; -#endif - } else if (!pDVR->IsStartFixed() && !pDVR->IsEndFixed()){ -#ifdef ISNAN - ss << "0; i + gid0 < " << pDVR->GetArrayLength(); - ss << " && i < "<< nCurWindowSize << "; i++){\n"; -#else - ss << "0; i < "<< nCurWindowSize << "; i++)\n"; -#endif - } - else { -#ifdef ISNAN - ss << "0; i < "<< nCurWindowSize << "; i++){\n"; -#else - ss << "0; i < "<< nCurWindowSize << "; i++)\n"; -#endif - } - nItems += nCurWindowSize; - } - else if (pCur->GetType() == formula::svSingleVectorRef) + if (pCur->GetType() == formula::svSingleVectorRef) { #ifdef ISNAN const formula::SingleVectorRefToken* pSVR = @@ -3288,16 +3251,17 @@ void OpNper::GenSlidingWindowFunction(std::stringstream &ss, #endif } ss <<" if (tmp0 == 0.0)\n"; - ss <<" tmp=(-(tmp2 + tmp3)/tmp1);\n"; + ss <<" tmp=(-1*(tmp2 + tmp3)/tmp1);\n"; ss <<" else if (tmp4 > 0.0)\n"; - ss <<" tmp=log(-(tmp0*tmp3-tmp1*(1.0+tmp0))/"; - ss <<"(tmp0*tmp2+tmp1*(1.0+tmp0)))/log(1.0+tmp0);\n"; + ss <<" tmp=log(-1*(tmp0*tmp3-tmp1*(1.0+tmp0))*"; + ss <<"pow((tmp0*tmp2+tmp1*(1.0+tmp0)),-1))/log(1.0+tmp0);\n"; ss <<" else\n"; - ss <<" tmp=log(-(tmp0*tmp3-tmp1)/(tmp0*tmp2+tmp1))"; + ss <<" tmp=log(-1*(tmp0*tmp3-tmp1)*pow(tmp0*tmp2+tmp1,-1))"; ss <<"/log(1.0+tmp0);\n"; ss <<" return tmp;\n"; ss <<"}"; } + void OpPPMT::BinInlineFun(std::set<std::string>& decls, std::set<std::string>& funs) { |