sc/source/core/opencl/op_financial.cxx | 52 ++++++++++++------------- sc/source/core/opencl/opinlinefun_finacial.cxx | 46 +++++++++++----------- 2 files changed, 49 insertions(+), 49 deletions(-)
New commits: commit 971b81b1c0922ab749eaf620cbf56d9780a15cfb Author: Johnny_M <kla...@partyheld.de> Date: Sat Nov 11 16:00:33 2017 +0100 Translate German variable and function names in Calc (financial) This follows up on https://gerrit.libreoffice.org/44295 Change-Id: Iac8351161a5e0d79a61fbb06d96985f92db68e3c Reviewed-on: https://gerrit.libreoffice.org/44626 Tested-by: Jenkins <c...@libreoffice.org> Reviewed-by: Eike Rathke <er...@redhat.com> diff --git a/sc/source/core/opencl/op_financial.cxx b/sc/source/core/opencl/op_financial.cxx index 3c9a6d775c35..cec37d9a5dd0 100644 --- a/sc/source/core/opencl/op_financial.cxx +++ b/sc/source/core/opencl/op_financial.cxx @@ -396,8 +396,8 @@ void OpINTRATE::GenSlidingWindowFunction(std::stringstream& ss, void OpFV::BinInlineFun(std::set<std::string>& decls, std::set<std::string>& funs) { - decls.insert(GetZwDecl); - funs.insert(GetZw); + decls.insert(GetFVDecl); + funs.insert(GetFV); } void OpFV::GenSlidingWindowFunction(std::stringstream& ss, @@ -438,7 +438,7 @@ void OpFV::GenSlidingWindowFunction(std::stringstream& ss, ss << ";\n"; } } - ss << " tmp = GetZw(arg0, arg1, arg2, arg3, arg4);\n"; + ss << " tmp = GetFV(arg0, arg1, arg2, arg3, arg4);\n"; ss << " return tmp;\n"; ss << "}"; } @@ -446,8 +446,8 @@ void OpFV::GenSlidingWindowFunction(std::stringstream& ss, void OpIPMT::BinInlineFun(std::set<std::string>& decls, std::set<std::string>& funs) { - decls.insert(GetZwDecl); - funs.insert(GetZw); + decls.insert(GetFVDecl); + funs.insert(GetFV); } void OpIPMT::GenSlidingWindowFunction(std::stringstream& ss, @@ -509,10 +509,10 @@ void OpIPMT::GenSlidingWindowFunction(std::stringstream& ss, ss << " else\n"; ss << " {\n"; ss << " if(arg5 > 0.0)\n"; - ss << " tmp = GetZw(arg0, arg1 - 2.0, pmt, arg3, 1.0)"; + ss << " tmp = GetFV(arg0, arg1 - 2.0, pmt, arg3, 1.0)"; ss << " - pmt;\n"; ss << " else\n"; - ss << " tmp = GetZw(arg0, arg1 - 1.0, pmt, arg3, 0.0);\n"; + ss << " tmp = GetFV(arg0, arg1 - 1.0, pmt, arg3, 0.0);\n"; ss << " }\n"; ss << " tmp = tmp * arg0;\n"; ss << " return tmp;\n"; @@ -795,8 +795,8 @@ void Fvschedule::GenSlidingWindowFunction( void Cumipmt::BinInlineFun(std::set<std::string>& decls, std::set<std::string>& funs) { - decls.insert(GetRmz_newDecl); decls.insert(GetZw_newDecl); - funs.insert(GetRmz_new);funs.insert(GetZw_new); + decls.insert(GetPMT_newDecl); decls.insert(GetFV_newDecl); + funs.insert(GetPMT_new);funs.insert(GetFV_new); } void Cumipmt::GenSlidingWindowFunction( std::stringstream &ss, const std::string &sSymName, SubArguments & @@ -891,7 +891,7 @@ vSubArguments) ss <<" nPayType = (int)"<<vSubArguments[5]->GenSlidingWindowDeclRef(); ss <<";\n"; ss <<" double fPmt;\n"; - ss <<" fPmt = GetRmz_new( fRate, nNumPeriods, fVal, 0.0, nPayType );\n"; + ss <<" fPmt = GetPMT_new( fRate, nNumPeriods, fVal, 0.0, nPayType );\n"; ss <<" double tmp = 0.0;\n"; ss <<" if( nStartPer == 1 )\n"; ss <<" {\n"; @@ -902,10 +902,10 @@ vSubArguments) ss <<" for( ; nStartPer<= nEndPer ; nStartPer++ )\n"; ss <<" {\n"; ss <<" if( nPayType > 0 )\n"; - ss <<" tmp += GetZw_new( fRate, nStartPer - 2 , "; + ss <<" tmp += GetFV_new( fRate, nStartPer - 2 , "; ss <<"fPmt, fVal, 1 ) - fPmt;\n"; ss <<" else\n"; - ss <<" tmp += GetZw_new( fRate, nStartPer - 1 , "; + ss <<" tmp += GetFV_new( fRate, nStartPer - 1 , "; ss <<"fPmt, fVal, 0 );\n"; ss <<" }\n"; ss <<" tmp *= fRate;\n"; @@ -1592,8 +1592,8 @@ void OpTbilleq::GenSlidingWindowFunction( void OpCumprinc::BinInlineFun(std::set<std::string>& decls, std::set<std::string>& funs) { - decls.insert(GetRmz_newDecl); decls.insert(GetZw_newDecl); - funs.insert(GetRmz_new);funs.insert(GetZw_new); + decls.insert(GetPMT_newDecl); decls.insert(GetFV_newDecl); + funs.insert(GetPMT_new);funs.insert(GetFV_new); } void OpCumprinc::GenSlidingWindowFunction(std::stringstream &ss, const std::string &sSymName, SubArguments &vSubArguments) @@ -1689,7 +1689,7 @@ void OpCumprinc::GenSlidingWindowFunction(std::stringstream &ss, ss <<vSubArguments[5]->GenSlidingWindowDeclRef(); ss <<";\n"; ss <<" double fPmt;\n"; - ss <<" fPmt = GetRmz_new( fRate, nNumPeriods,fVal,0.0,nPayType );\n"; + ss <<" fPmt = GetPMT_new( fRate, nNumPeriods,fVal,0.0,nPayType );\n"; ss <<" if(nStartPer == 1)\n"; ss <<" {\n"; ss <<" if( nPayType <= 0 )\n"; @@ -1701,10 +1701,10 @@ void OpCumprinc::GenSlidingWindowFunction(std::stringstream &ss, ss <<" for( int i = nStartPer ; i <= nEndPer ; i++ )\n"; ss <<" {\n"; ss <<" if( nPayType > 0 )\n"; - ss <<" tmp += fPmt - ( GetZw_new( fRate,i - 2,"; + ss <<" tmp += fPmt - ( GetFV_new( fRate,i - 2,"; ss <<"fPmt,fVal,1)- fPmt ) * fRate;\n"; ss <<" else\n"; - ss <<" tmp += fPmt - GetZw_new( fRate, i - 1,"; + ss <<" tmp += fPmt - GetFV_new( fRate, i - 1,"; ss <<"fPmt,fVal,0 ) * fRate;\n"; ss <<" }\n"; ss <<" return tmp;\n"; @@ -2904,8 +2904,8 @@ void OpNper::GenSlidingWindowFunction(std::stringstream &ss, void OpPPMT::BinInlineFun(std::set<std::string>& decls, std::set<std::string>& funs) { - decls.insert(GetZwDecl); - funs.insert(GetZw); + decls.insert(GetFVDecl); + funs.insert(GetFV); } void OpPPMT::GenSlidingWindowFunction(std::stringstream &ss, @@ -2981,9 +2981,9 @@ void OpPPMT::GenSlidingWindowFunction(std::stringstream &ss, ss<<" else\n"; ss<<" {\n"; ss<<" if(tmp5>0.0)\n "; - ss<<" re=GetZw(tmp0, tmp1-2.0, pmt, tmp3, 1.0) - pmt;\n"; + ss<<" re=GetFV(tmp0, tmp1-2.0, pmt, tmp3, 1.0) - pmt;\n"; ss<<" else\n"; - ss<<" re=GetZw(tmp0, tmp1-1.0, pmt, tmp3, 0.0);\n"; + ss<<" re=GetFV(tmp0, tmp1-1.0, pmt, tmp3, 0.0);\n"; ss<<" }\n "; ss<<" re = re * tmp0;\n"; ss<<" tmp = pmt - re;\n"; @@ -3534,7 +3534,7 @@ void OpCoupnum::GenSlidingWindowFunction(std::stringstream &ss, void OpAmordegrc::BinInlineFun(std::set<std::string>& decls, std::set<std::string>& funs) { - decls.insert(nKorrValDecl); decls.insert(RoundDecl); + decls.insert(nCorrValDecl); decls.insert(RoundDecl); decls.insert(IsLeapYearDecl);decls.insert(DaysInMonthDecl); decls.insert(DaysToDateDecl); decls.insert(DateToDaysDecl); decls.insert(GetNullDateDecl); decls.insert(GetYearFracDecl); @@ -3682,7 +3682,7 @@ void OpAmordegrc::GenSlidingWindowFunction(std::stringstream &ss, void OpAmorlinc::BinInlineFun(std::set<std::string>& decls, std::set<std::string>& funs) { - decls.insert(nKorrValDecl); decls.insert(RoundDecl); + decls.insert(nCorrValDecl); decls.insert(RoundDecl); decls.insert(IsLeapYearDecl);decls.insert(DaysInMonthDecl); decls.insert(DaysToDateDecl); decls.insert(DateToDaysDecl); decls.insert(GetYearFracDecl); @@ -4067,7 +4067,7 @@ void OpTbillprice::GenSlidingWindowFunction( void RATE::BinInlineFun(std::set<std::string>& decls, std::set<std::string>& funs) { - decls.insert(nKorrValDecl); + decls.insert(nCorrValDecl); decls.insert(SCdEpsilonDecl);decls.insert(RoundDecl); funs.insert(Round); } @@ -4520,9 +4520,9 @@ tmpCur4); void OpVDB::BinInlineFun(std::set<std::string>& decls, std::set<std::string>& funs) { - decls.insert(ScGetGDADecl);decls.insert(DblMinDecl); + decls.insert(ScGetDDBDecl);decls.insert(DblMinDecl); decls.insert(ScInterVDBDecl);decls.insert(VDBImplementDecl); - funs.insert(ScGetGDA);funs.insert(DblMin); + funs.insert(ScGetDDB);funs.insert(DblMin); funs.insert(ScInterVDB);funs.insert(VDBImplement); } diff --git a/sc/source/core/opencl/opinlinefun_finacial.cxx b/sc/source/core/opencl/opinlinefun_finacial.cxx index 6093583dc87c..782e86b89f9e 100644 --- a/sc/source/core/opencl/opinlinefun_finacial.cxx +++ b/sc/source/core/opencl/opinlinefun_finacial.cxx @@ -10,7 +10,7 @@ #ifndef SC_OPENCL_OPINLINFUN_finacial #define SC_OPENCL_OPINLINFUN_finacial -std::string nKorrValDecl ="double constant nCorrVal[]" +std::string nCorrValDecl ="double constant nCorrVal[]" "= {0, 9e-1, 9e-2, 9e-3, 9e-4, 9e-5, 9e-6, 9e-7, " "9e-8,9e-9, 9e-10, 9e-11, 9e-12, 9e-13, 9e-14, 9e-15};\n"; @@ -40,11 +40,11 @@ std::string Round = " return fValue;\n" "}\n"; -std::string GetRmzDecl = -"double GetRmz( double fRate, double fNper, double fPv, double fFv, int nPayType );\n"; +std::string GetPMTDecl = +"double GetPMT( double fRate, double fNper, double fPv, double fFv, int nPayType );\n"; -std::string GetRmz= -"double GetRmz( double fRate, double fNper, double fPv, double fFv, int nPayType )\n" +std::string GetPMT= +"double GetPMT( double fRate, double fNper, double fPv, double fFv, int nPayType )\n" "{\n" " double fPmt;\n" " if( fRate == 0.0 )\n" @@ -62,11 +62,11 @@ std::string GetRmz= " return -fPmt;\n" "}\n"; -std::string GetRmz_newDecl = -"double GetRmz_new( double fRate, double fNper, double fPv, double fFv," +std::string GetPMT_newDecl = +"double GetPMT_new( double fRate, double fNper, double fPv, double fFv," "int nPayType );\n"; -std::string GetRmz_new= -"double GetRmz_new( double fRate, double fNper, double fPv, double fFv," +std::string GetPMT_new= +"double GetPMT_new( double fRate, double fNper, double fPv, double fFv," "int nPayType)\n" "{\n" " double fPmt;\n" @@ -79,12 +79,12 @@ std::string GetRmz_new= "1.0 - pow( fTerm,-1),-1 );\n" " return -fPmt;\n" "}\n"; -std::string GetZwDecl = -"double GetZw( double fRate, double fNper, double fPmt," +std::string GetFVDecl = +"double GetFV( double fRate, double fNper, double fPmt," "double fPv, int nPayType );\n"; -std::string GetZw = -"double GetZw( double fRate, double fNper, double fPmt," +std::string GetFV = +"double GetFV( double fRate, double fNper, double fPmt," "double fPv, int nPayType )\n" "{\n" " double fFv;\n" @@ -102,12 +102,12 @@ std::string GetZw = " return -fFv;\n" "}\n"; -std::string GetZw_newDecl = -"double GetZw_new( double fRate, double fNper, double fPmt," +std::string GetFV_newDecl = +"double GetFV_new( double fRate, double fNper, double fPmt," "double fPv, int nPayType );\n"; -std::string GetZw_new = -"double GetZw_new( double fRate, double fNper, double fPmt," +std::string GetFV_new = +"double GetFV_new( double fRate, double fNper, double fPmt," "double fPv, int nPayType )\n" "{\n" " double fFv;\n" @@ -1442,12 +1442,12 @@ std::string GetDuration_new= " return fDur;\n" " }\n"; -std::string ScGetGDADecl= -"double ScGetGDA(double fCost, double fSalvage, double fLife, double fPeriod," +std::string ScGetDDBDecl= +"double ScGetDDB(double fCost, double fSalvage, double fLife, double fPeriod," "double fFactor);\n"; -std::string ScGetGDA= -"double ScGetGDA(double fCost, double fSalvage, double fLife, double fPeriod," +std::string ScGetDDB= +"double ScGetDDB(double fCost, double fSalvage, double fLife, double fPeriod," "double fFactor)\n" "{\n" " double fDdb, fRate, fOldValue, fNewValue;\n" @@ -1504,7 +1504,7 @@ std::string ScInterVDB= " {\n" " if(!nNowSln)\n" " {\n" -" fDdb = ScGetGDA(fCost, fSalvage, fLife, (double) i, fFactor);\n" +" fDdb = ScGetDDB(fCost, fSalvage, fLife, (double) i, fFactor);\n" " fSln = fSalvageValue/ (fLife1 - (double) (i-1));\n" " if (fSln > fDdb)\n" " {\n" @@ -1547,7 +1547,7 @@ std::string VDBImplement= " {\n" " for (int i = nLoopStart + 1; i <= nLoopEnd; i++)\n" " {\n" -" double fTerm = ScGetGDA(fCost, fSalvage, fLife, (double) i, fFactor" +" double fTerm = ScGetDDB(fCost, fSalvage, fLife, (double) i, fFactor" ");\n" " if ( i == nLoopStart+1 )\n" " fTerm *= ( DblMin( fEnd, fIntStart + 1.0 ) - fStart );\n" _______________________________________________ Libreoffice-commits mailing list libreoffice-comm...@lists.freedesktop.org https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits