[Libreoffice-commits] core.git: sc/source

tamsil1amani3 tamsajama at gmail.com
Sun Dec 25 07:34:43 UTC 2016


 sc/source/core/opencl/op_financial.cxx |   12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

New commits:
commit 452b8334e60082c113809f90fd59967ac9c471a2
Author: tamsil1amani3 <tamsajama at gmail.com>
Date:   Sun Dec 25 03:44:28 2016 +0530

    tdf#39674 Converted terms from German to English
    
    Renamed variable fSchaetwert -> fEstimated
    
    Change-Id: Ia02c5c58149191286ec7dda2ad4ac2032aa4124a
    Reviewed-on: https://gerrit.libreoffice.org/32414
    Tested-by: Jenkins <ci at libreoffice.org>
    Reviewed-by: jan iversen <jani at documentfoundation.org>

diff --git a/sc/source/core/opencl/op_financial.cxx b/sc/source/core/opencl/op_financial.cxx
index fce903e..a10f094 100644
--- a/sc/source/core/opencl/op_financial.cxx
+++ b/sc/source/core/opencl/op_financial.cxx
@@ -929,7 +929,7 @@ void IRR::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "    int gid0 = get_global_id(0);\n";
     FormulaToken* pSur = vSubArguments[1]->GetFormulaToken();
     assert(pSur);
-    ss << "    double fSchaetzwert = ";
+    ss << "    double fEstimated = ";
     ss << vSubArguments[1]->GenSlidingWindowDeclRef() << ";\n";
     ss << "    double fEps = 1.0;\n";
     ss << "    double x = 0.0, xNeu = 0.0, fZaehler = 0.0, fNenner = 0.0;\n";
@@ -939,18 +939,18 @@ void IRR::GenSlidingWindowFunction(std::stringstream &ss,
         const formula::SingleVectorRefToken* pSVR =
             static_cast< const formula::SingleVectorRefToken* >(pSur);
         ss << "    if (gid0 >= " << pSVR->GetArrayLength() << ")\n";
-        ss << "        fSchaetzwert = 0.1;\n";
-        ss << "    if (isnan(fSchaetzwert))\n";
+        ss << "        fEstimated = 0.1;\n";
+        ss << "    if (isnan(fEstimated))\n";
         ss << "        x = 0.1;\n";
         ss << "    else\n";
     }
     else if (pSur->GetType() == formula::svDouble)
     {
-        ss << "    if (isnan(fSchaetzwert))\n";
+        ss << "    if (isnan(fEstimated))\n";
         ss << "        x = 0.1;\n";
         ss << "    else\n";
     }
-    ss << "        x = fSchaetzwert;\n";
+    ss << "        x = fEstimated;\n";
     ss << "    unsigned short nItCount = 0;\n";
     ss << "    while (fEps > Epsilon && nItCount < 20){\n";
     ss << "        nCount = 0.0; fZaehler = 0.0;  fNenner = 0.0;\n";
@@ -1061,7 +1061,7 @@ void IRR::GenSlidingWindowFunction(std::stringstream &ss,
     ss << "        fEps = fabs(xNeu - x);\n";
     ss << "        x = xNeu;\n";
     ss << "        nItCount++;\n    }\n";
-    ss << "        if (fSchaetzwert == 0.0 && fabs(x) < Epsilon)\n";
+    ss << "        if (fEstimated == 0.0 && fabs(x) < Epsilon)\n";
     ss << "            x = 0.0;\n";
     ss << "        if (fEps < Epsilon)\n";
     ss << "            return x;\n";


More information about the Libreoffice-commits mailing list