diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-02-25 13:54:12 +0300 |
---|---|---|
committer | Mike Kaganski <mike.kaganski@collabora.com> | 2020-02-27 11:02:16 +0100 |
commit | 1782810f886acd26db211d8fdd7ae8796d203c57 (patch) | |
tree | 2bd0421114294e2f93661cb2927e03310c826358 /sc/qa/unit/data | |
parent | f3e7004794eded346d98264d3061f4e4aa80ee0a (diff) |
Related: tdf#130725: use strtod also in rtl::math::stringToDouble
Size of buffer on stack is 256 characters. Logging function usage
in make check, of >1 100 000 invocations, the longest string was
80 characters, average being 4.6 characters. So heap allocation
is unlikely in scenarios with intensive function usage.
Several existing unit tests had to be fixed. Usually, the change
is either minimal or getting closer to what Excel returns (for
Calc tests). But in case of AMORDEGRC, I had to change rate value
passed to the function from 0.3 to 0.31. It's because the closest
double value for 0.3 is 0.29999999999999999, which is a bit less
than 0.3; multiplied by 1.5, this gives 0.44999999999999996, and
then rounding the result of multiplication of the latter by cost
gave the result 1 less than before, when 0.3 was imported as
0.30000000000000004. Now the function returns a value 1 less than
Excel for that set of arguments. I don't see how to fix that.
Having rate slightly different gives consistent result between
Calc and Excel.
Change-Id: Icae5ce374fe0c31a1aa10cee815e65ef0014f382
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/89422
Tested-by: Jenkins
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Diffstat (limited to 'sc/qa/unit/data')
7 files changed, 122 insertions, 122 deletions
diff --git a/sc/qa/unit/data/functions/array/fods/linest.fods b/sc/qa/unit/data/functions/array/fods/linest.fods index 1465f7b85e13..fbf27b2053ca 100644 --- a/sc/qa/unit/data/functions/array/fods/linest.fods +++ b/sc/qa/unit/data/functions/array/fods/linest.fods @@ -6674,11 +6674,11 @@ <table:table-cell table:number-columns-repeated="13"/> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:formula="of:=[.M185]" office:value-type="float" office:value="2484916.49382742" calcext:value-type="float"> - <text:p>2484916.49382742</text:p> + <table:table-cell table:formula="of:=[.M185]" office:value-type="float" office:value="2484916.49382745" calcext:value-type="float"> + <text:p>2484916.49382745</text:p> </table:table-cell> - <table:table-cell office:value-type="float" office:value="2484916.49382742" calcext:value-type="float"> - <text:p>2484916.49382742</text:p> + <table:table-cell office:value-type="float" office:value="2484916.49382745" calcext:value-type="float"> + <text:p>2484916.49382745</text:p> </table:table-cell> <table:table-cell table:style-name="ce15" table:formula="of:=ROUND([.A171];12)=ROUND([.B171];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> @@ -7004,8 +7004,8 @@ <text:p>=M195</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="8"/> - <table:table-cell office:value-type="float" office:value="2484916.49382742" calcext:value-type="float"> - <text:p>2484916.49382742</text:p> + <table:table-cell office:value-type="float" office:value="2484916.49382745" calcext:value-type="float"> + <text:p>2484916.49382745</text:p> </table:table-cell> <table:table-cell office:value-type="float" office:value="1" calcext:value-type="float"> <text:p>1</text:p> @@ -7352,11 +7352,11 @@ <table:table-cell table:number-columns-repeated="12"/> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:formula="of:=[.M208]" office:value-type="float" office:value="786024.50000001" calcext:value-type="float"> - <text:p>786024.50000001</text:p> + <table:table-cell table:formula="of:=[.M208]" office:value-type="float" office:value="786024.500000118" calcext:value-type="float"> + <text:p>786024.500000118</text:p> </table:table-cell> - <table:table-cell office:value-type="float" office:value="786024.50000001" calcext:value-type="float"> - <text:p>786024.50000001</text:p> + <table:table-cell office:value-type="float" office:value="786024.500000118" calcext:value-type="float"> + <text:p>786024.500000118</text:p> </table:table-cell> <table:table-cell table:style-name="ce15" table:formula="of:=ROUND([.A201];12)=ROUND([.B201];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> @@ -7533,8 +7533,8 @@ <text:p>=O205</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="8"/> - <table:table-cell office:value-type="float" office:value="786024.50000001" calcext:value-type="float"> - <text:p>786024.50000001</text:p> + <table:table-cell office:value-type="float" office:value="786024.500000118" calcext:value-type="float"> + <text:p>786024.500000118</text:p> </table:table-cell> <table:table-cell office:value-type="float" office:value="1" calcext:value-type="float"> <text:p>1</text:p> @@ -7701,11 +7701,11 @@ <table:table-cell table:number-columns-repeated="12"/> </table:table-row> <table:table-row table:style-name="ro2"> - <table:table-cell table:formula="of:=[.M219]" office:value-type="float" office:value="786024.50000001" calcext:value-type="float"> - <text:p>786024.50000001</text:p> + <table:table-cell table:formula="of:=[.M219]" office:value-type="float" office:value="786024.500000118" calcext:value-type="float"> + <text:p>786024.500000118</text:p> </table:table-cell> - <table:table-cell office:value-type="float" office:value="786024.50000001" calcext:value-type="float"> - <text:p>786024.50000001</text:p> + <table:table-cell office:value-type="float" office:value="786024.500000118" calcext:value-type="float"> + <text:p>786024.500000118</text:p> </table:table-cell> <table:table-cell table:style-name="ce15" table:formula="of:=ROUND([.A216];12)=ROUND([.B216];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> @@ -7789,8 +7789,8 @@ <text:p>=N217</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="8"/> - <table:table-cell office:value-type="float" office:value="786024.50000001" calcext:value-type="float"> - <text:p>786024.50000001</text:p> + <table:table-cell office:value-type="float" office:value="786024.500000118" calcext:value-type="float"> + <text:p>786024.500000118</text:p> </table:table-cell> <table:table-cell office:value-type="float" office:value="1" calcext:value-type="float"> <text:p>1</text:p> diff --git a/sc/qa/unit/data/functions/financial/fods/amordegrc.fods b/sc/qa/unit/data/functions/financial/fods/amordegrc.fods index 0e98f330bf0c..68c22fb58340 100644 --- a/sc/qa/unit/data/functions/financial/fods/amordegrc.fods +++ b/sc/qa/unit/data/functions/financial/fods/amordegrc.fods @@ -1312,11 +1312,11 @@ <table:table-cell table:style-name="ce28"/> </table:table-row> <table:table-row table:style-name="ro7"> - <table:table-cell table:formula="of:=AMORDEGRC([.J1];[.J2];[.J3];[.J4];[.J5];[.J6];[.J7])" office:value-type="float" office:value="2813" calcext:value-type="float"> - <text:p>2813</text:p> + <table:table-cell table:formula="of:=AMORDEGRC([.J1];[.J2];[.J3];[.J4];[.J5];[.J6];[.J7])" office:value-type="float" office:value="2848" calcext:value-type="float"> + <text:p>2848</text:p> </table:table-cell> - <table:table-cell table:style-name="ce14" office:value-type="float" office:value="2813" calcext:value-type="float"> - <text:p>2813</text:p> + <table:table-cell table:style-name="ce14" office:value-type="float" office:value="2848" calcext:value-type="float"> + <text:p>2848</text:p> </table:table-cell> <table:table-cell table:style-name="ce15" table:formula="of:=[.A2]=[.B2]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>PRAVDA</text:p> @@ -1344,17 +1344,17 @@ <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro8"> - <table:table-cell table:formula="of:=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0.3;1)" office:value-type="float" office:value="2813" calcext:value-type="float"> - <text:p>2813</text:p> + <table:table-cell table:formula="of:=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0.31;1)" office:value-type="float" office:value="2848" calcext:value-type="float"> + <text:p>2848</text:p> </table:table-cell> - <table:table-cell table:style-name="ce14" office:value-type="float" office:value="2813" calcext:value-type="float"> - <text:p>2813</text:p> + <table:table-cell table:style-name="ce14" office:value-type="float" office:value="2848" calcext:value-type="float"> + <text:p>2848</text:p> </table:table-cell> <table:table-cell table:style-name="ce15" table:formula="of:=[.A3]=[.B3]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>PRAVDA</text:p> </table:table-cell> - <table:table-cell table:formula="of:=FORMULA([.A3])" office:value-type="string" office:string-value="=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,3;1)" calcext:value-type="string"> - <text:p>=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,3;1)</text:p> + <table:table-cell table:formula="of:=FORMULA([.A3])" office:value-type="string" office:string-value="=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,31;1)" calcext:value-type="string"> + <text:p>=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,31;1)</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>tdf69569, verified with Excel2016</text:p> @@ -1376,17 +1376,17 @@ <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro8"> - <table:table-cell table:formula="of:=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0.3;1)" office:value-type="float" office:value="2813" calcext:value-type="float"> - <text:p>2813</text:p> + <table:table-cell table:formula="of:=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0.31;1)" office:value-type="float" office:value="2848" calcext:value-type="float"> + <text:p>2848</text:p> </table:table-cell> - <table:table-cell table:style-name="ce14" office:value-type="float" office:value="2813" calcext:value-type="float"> - <text:p>2813</text:p> + <table:table-cell table:style-name="ce14" office:value-type="float" office:value="2848" calcext:value-type="float"> + <text:p>2848</text:p> </table:table-cell> <table:table-cell table:style-name="ce15" table:formula="of:=[.A4]=[.B4]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>PRAVDA</text:p> </table:table-cell> - <table:table-cell table:style-name="ce25" table:formula="of:=FORMULA([.A4])" office:value-type="string" office:string-value="=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,3;1)" calcext:value-type="string"> - <text:p>=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,3;1)</text:p> + <table:table-cell table:style-name="ce25" table:formula="of:=FORMULA([.A4])" office:value-type="string" office:string-value="=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,31;1)" calcext:value-type="string"> + <text:p>=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,31;1)</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>tdf69569, verified with Excel2016</text:p> @@ -1408,17 +1408,17 @@ <table:table-cell table:style-name="ce28"/> </table:table-row> <table:table-row table:style-name="ro9"> - <table:table-cell table:formula="of:=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0.3;0)" office:value-type="float" office:value="2813" calcext:value-type="float"> - <text:p>2813</text:p> + <table:table-cell table:formula="of:=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0.31;0)" office:value-type="float" office:value="2848" calcext:value-type="float"> + <text:p>2848</text:p> </table:table-cell> - <table:table-cell office:value-type="float" office:value="2813" calcext:value-type="float"> - <text:p>2813</text:p> + <table:table-cell office:value-type="float" office:value="2848" calcext:value-type="float"> + <text:p>2848</text:p> </table:table-cell> <table:table-cell table:style-name="ce15" table:formula="of:=[.A5]=[.B5]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>PRAVDA</text:p> </table:table-cell> - <table:table-cell table:style-name="ce25" table:formula="of:=FORMULA([.A5])" office:value-type="string" office:string-value="=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,3;0)" calcext:value-type="string"> - <text:p>=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,3;0)</text:p> + <table:table-cell table:style-name="ce25" table:formula="of:=FORMULA([.A5])" office:value-type="string" office:string-value="=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,31;0)" calcext:value-type="string"> + <text:p>=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,31;0)</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="4"/> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1437,17 +1437,17 @@ <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro6"> - <table:table-cell table:formula="of:=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0.3;3)" office:value-type="float" office:value="2808" calcext:value-type="float"> - <text:p>2808</text:p> + <table:table-cell table:formula="of:=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0.31;3)" office:value-type="float" office:value="2843" calcext:value-type="float"> + <text:p>2843</text:p> </table:table-cell> - <table:table-cell office:value-type="float" office:value="2808" calcext:value-type="float"> - <text:p>2808</text:p> + <table:table-cell office:value-type="float" office:value="2843" calcext:value-type="float"> + <text:p>2843</text:p> </table:table-cell> <table:table-cell table:style-name="ce16" table:formula="of:=[.A6]=[.B6]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>PRAVDA</text:p> </table:table-cell> - <table:table-cell table:style-name="ce25" table:formula="of:=FORMULA([.A6])" office:value-type="string" office:string-value="=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,3;3)" calcext:value-type="string"> - <text:p>=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,3;3)</text:p> + <table:table-cell table:style-name="ce25" table:formula="of:=FORMULA([.A6])" office:value-type="string" office:string-value="=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,31;3)" calcext:value-type="string"> + <text:p>=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,31;3)</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Basis 3</text:p> @@ -1456,8 +1456,8 @@ <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>rate</text:p> </table:table-cell> - <table:table-cell table:style-name="ce27" office:value-type="percentage" office:value="0.3" calcext:value-type="percentage"> - <text:p>30,00%</text:p> + <table:table-cell table:style-name="ce27" office:value-type="percentage" office:value="0.31" calcext:value-type="percentage"> + <text:p>31,00%</text:p> </table:table-cell> <table:table-cell table:style-name="ce12"/> <table:table-cell table:style-name="ce11" office:value-type="float" office:value="1" calcext:value-type="float"> @@ -1469,17 +1469,17 @@ <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro9"> - <table:table-cell table:formula="of:=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0.3;4)" office:value-type="float" office:value="2818" calcext:value-type="float"> - <text:p>2818</text:p> + <table:table-cell table:formula="of:=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0.31;4)" office:value-type="float" office:value="2854" calcext:value-type="float"> + <text:p>2854</text:p> </table:table-cell> - <table:table-cell office:value-type="float" office:value="2818" calcext:value-type="float"> - <text:p>2818</text:p> + <table:table-cell office:value-type="float" office:value="2854" calcext:value-type="float"> + <text:p>2854</text:p> </table:table-cell> <table:table-cell table:style-name="ce17" table:formula="of:=[.A7]=[.B7]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>PRAVDA</text:p> </table:table-cell> - <table:table-cell table:style-name="ce25" table:formula="of:=FORMULA([.A7])" office:value-type="string" office:string-value="=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,3;4)" calcext:value-type="string"> - <text:p>=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,3;4)</text:p> + <table:table-cell table:style-name="ce25" table:formula="of:=FORMULA([.A7])" office:value-type="string" office:string-value="=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,31;4)" calcext:value-type="string"> + <text:p>=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,31;4)</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Basis 4</text:p> @@ -1501,11 +1501,11 @@ <table:table-cell table:style-name="ce28"/> </table:table-row> <table:table-row table:style-name="ro9"> - <table:table-cell table:style-name="Comma_20_2" table:formula="of:=AMORDEGRC([.J1];[.J2];[.J3];[.J4];[.J5];[.J6];)" office:value-type="float" office:value="2813" calcext:value-type="float"> - <text:p><text:s/>2 813,00 </text:p> + <table:table-cell table:style-name="Comma_20_2" table:formula="of:=AMORDEGRC([.J1];[.J2];[.J3];[.J4];[.J5];[.J6];)" office:value-type="float" office:value="2848" calcext:value-type="float"> + <text:p><text:s/>2 848,00 </text:p> </table:table-cell> - <table:table-cell office:value-type="float" office:value="2813" calcext:value-type="float"> - <text:p>2813</text:p> + <table:table-cell office:value-type="float" office:value="2848" calcext:value-type="float"> + <text:p>2848</text:p> </table:table-cell> <table:table-cell table:style-name="ce17" table:formula="of:=[.A8]=[.B8]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>PRAVDA</text:p> @@ -1527,11 +1527,11 @@ <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro6"> - <table:table-cell table:formula="of:=AMORDEGRC([.J1];[.J2];[.J3];[.J4];[.J5];[.J6])" office:value-type="float" office:value="2813" calcext:value-type="float"> - <text:p>2813</text:p> + <table:table-cell table:formula="of:=AMORDEGRC([.J1];[.J2];[.J3];[.J4];[.J5];[.J6])" office:value-type="float" office:value="2848" calcext:value-type="float"> + <text:p>2848</text:p> </table:table-cell> - <table:table-cell office:value-type="float" office:value="2813" calcext:value-type="float"> - <text:p>2813</text:p> + <table:table-cell office:value-type="float" office:value="2848" calcext:value-type="float"> + <text:p>2848</text:p> </table:table-cell> <table:table-cell table:style-name="ce17" table:formula="of:=[.A9]=[.B9]" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>PRAVDA</text:p> @@ -1573,7 +1573,7 @@ <table:table-cell table:style-name="ce28"/> </table:table-row> <table:table-row table:style-name="ro10"> - <table:table-cell table:formula="of:=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;-1;0.3;4)" office:value-type="string" office:string-value="" calcext:value-type="error"> + <table:table-cell table:formula="of:=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;-1;0.31;4)" office:value-type="string" office:string-value="" calcext:value-type="error"> <text:p>Err:502</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1582,8 +1582,8 @@ <table:table-cell table:style-name="ce15" table:formula="of:=ISERROR([.A11])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>PRAVDA</text:p> </table:table-cell> - <table:table-cell table:style-name="ce25" table:formula="of:=FORMULA([.A11])" office:value-type="string" office:string-value="=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;-1;0,3;4)" calcext:value-type="string"> - <text:p>=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;-1;0,3;4)</text:p> + <table:table-cell table:style-name="ce25" table:formula="of:=FORMULA([.A11])" office:value-type="string" office:string-value="=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;-1;0,31;4)" calcext:value-type="string"> + <text:p>=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;-1;0,31;4)</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Tdf#100523</text:p> @@ -1596,7 +1596,7 @@ <table:table-cell table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro10"> - <table:table-cell table:formula="of:=AMORDEGRC(-10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0.3;4)" office:value-type="string" office:string-value="" calcext:value-type="error"> + <table:table-cell table:formula="of:=AMORDEGRC(-10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0.31;4)" office:value-type="string" office:string-value="" calcext:value-type="error"> <text:p>Err:502</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1605,8 +1605,8 @@ <table:table-cell table:style-name="ce15" table:formula="of:=ISERROR([.A12])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>PRAVDA</text:p> </table:table-cell> - <table:table-cell table:style-name="ce25" table:formula="of:=FORMULA([.A12])" office:value-type="string" office:string-value="=AMORDEGRC(-10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,3;4)" calcext:value-type="string"> - <text:p>=AMORDEGRC(-10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,3;4)</text:p> + <table:table-cell table:style-name="ce25" table:formula="of:=FORMULA([.A12])" office:value-type="string" office:string-value="=AMORDEGRC(-10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,31;4)" calcext:value-type="string"> + <text:p>=AMORDEGRC(-10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,31;4)</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="5"/> <table:table-cell office:value-type="float" office:value="2" calcext:value-type="float"> @@ -1615,7 +1615,7 @@ <table:table-cell table:number-columns-repeated="4"/> </table:table-row> <table:table-row table:style-name="ro10"> - <table:table-cell table:formula="of:=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);-1500;1;0.3;4)" office:value-type="string" office:string-value="" calcext:value-type="error"> + <table:table-cell table:formula="of:=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);-1500;1;0.31;4)" office:value-type="string" office:string-value="" calcext:value-type="error"> <text:p>Err:502</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1624,8 +1624,8 @@ <table:table-cell table:style-name="ce15" table:formula="of:=ISERROR([.A13])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>PRAVDA</text:p> </table:table-cell> - <table:table-cell table:style-name="ce25" table:formula="of:=FORMULA([.A13])" office:value-type="string" office:string-value="=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);-1500;1;0,3;4)" calcext:value-type="string"> - <text:p>=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);-1500;1;0,3;4)</text:p> + <table:table-cell table:style-name="ce25" table:formula="of:=FORMULA([.A13])" office:value-type="string" office:string-value="=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);-1500;1;0,31;4)" calcext:value-type="string"> + <text:p>=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);-1500;1;0,31;4)</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Tdf #100523</text:p> @@ -1638,7 +1638,7 @@ <table:table-cell table:style-name="ce28" table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro10"> - <table:table-cell table:formula="of:=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;-0.3;4)" office:value-type="string" office:string-value="" calcext:value-type="error"> + <table:table-cell table:formula="of:=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;-0.31;4)" office:value-type="string" office:string-value="" calcext:value-type="error"> <text:p>Err:502</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> @@ -1647,8 +1647,8 @@ <table:table-cell table:style-name="ce18" table:formula="of:=ISERROR([.A14])" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>PRAVDA</text:p> </table:table-cell> - <table:table-cell table:style-name="ce25" table:formula="of:=FORMULA([.A14])" office:value-type="string" office:string-value="=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;-0,3;4)" calcext:value-type="string"> - <text:p>=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;-0,3;4)</text:p> + <table:table-cell table:style-name="ce25" table:formula="of:=FORMULA([.A14])" office:value-type="string" office:string-value="=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;-0,31;4)" calcext:value-type="string"> + <text:p>=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;-0,31;4)</text:p> </table:table-cell> <table:table-cell table:number-columns-repeated="5"/> <table:table-cell office:value-type="float" office:value="4" calcext:value-type="float"> @@ -1695,13 +1695,13 @@ <table:table-cell table:number-columns-repeated="11"/> </table:table-row> <table:table-row table:style-name="ro10"> - <table:table-cell table:formula="of:=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0.3;2)" office:value-type="string" office:string-value="" calcext:value-type="error"> + <table:table-cell table:formula="of:=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0.31;2)" office:value-type="string" office:string-value="" calcext:value-type="error"> <text:p>Err:502</text:p> </table:table-cell> <table:table-cell/> <table:table-cell table:style-name="ce21"/> - <table:table-cell table:style-name="ce25" table:formula="of:=FORMULA([.A19])" office:value-type="string" office:string-value="=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,3;2)" calcext:value-type="string"> - <text:p>=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,3;2)</text:p> + <table:table-cell table:style-name="ce25" table:formula="of:=FORMULA([.A19])" office:value-type="string" office:string-value="=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,31;2)" calcext:value-type="string"> + <text:p>=AMORDEGRC(10000;DATE(2012;3;1);DATE(2012;12;31);1500;1;0,31;2)</text:p> </table:table-cell> <table:table-cell office:value-type="string" calcext:value-type="string"> <text:p>Basis 2 <text:s text:c="2"/>tdf#100496</text:p> diff --git a/sc/qa/unit/data/functions/financial/fods/rate.fods b/sc/qa/unit/data/functions/financial/fods/rate.fods index 15dc9068193c..87080a647c5e 100644 --- a/sc/qa/unit/data/functions/financial/fods/rate.fods +++ b/sc/qa/unit/data/functions/financial/fods/rate.fods @@ -2764,11 +2764,11 @@ <table:table-cell table:number-columns-repeated="7"/> </table:table-row> <table:table-row table:style-name="ro6"> - <table:table-cell table:formula="of:=RATE([.L19];[.L21];[.L20];[.L22];[.L23];[.L24])" office:value-type="float" office:value="0.2500000946085" calcext:value-type="float"> - <text:p>0.2500000946085</text:p> + <table:table-cell table:formula="of:=RATE([.L19];[.L21];[.L20];[.L22];[.L23];[.L24])" office:value-type="float" office:value="0.250000092908987" calcext:value-type="float"> + <text:p>0.250000092908987</text:p> </table:table-cell> - <table:table-cell office:value-type="float" office:value="0.2500000946085" calcext:value-type="float"> - <text:p>0.2500000946085</text:p> + <table:table-cell office:value-type="float" office:value="0.250000092908987" calcext:value-type="float"> + <text:p>0.250000092908987</text:p> </table:table-cell> <table:table-cell table:style-name="ce22" table:formula="of:=ROUND([.A23];12)=ROUND([.B23];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> diff --git a/sc/qa/unit/data/functions/statistical/fods/betadist.fods b/sc/qa/unit/data/functions/statistical/fods/betadist.fods index 7ecd1f7b4217..45848b5d1f0e 100644 --- a/sc/qa/unit/data/functions/statistical/fods/betadist.fods +++ b/sc/qa/unit/data/functions/statistical/fods/betadist.fods @@ -3665,11 +3665,11 @@ <table:table-cell table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro7"> - <table:table-cell table:formula="of:=BETADIST([.I35];[.$J$13];[.$J$14];0;1;FALSE())" office:value-type="float" office:value="10251.4061542503" calcext:value-type="float"> - <text:p>10251.4061542503</text:p> + <table:table-cell table:formula="of:=BETADIST([.I35];[.$J$13];[.$J$14];0;1;FALSE())" office:value-type="float" office:value="10251.4061622172" calcext:value-type="float"> + <text:p>10251.4061622172</text:p> </table:table-cell> - <table:table-cell office:value-type="float" office:value="10251.4061542503" calcext:value-type="float"> - <text:p>10251.4061542503</text:p> + <table:table-cell office:value-type="float" office:value="10251.4061622172" calcext:value-type="float"> + <text:p>10251.4061622172</text:p> </table:table-cell> <table:table-cell table:style-name="ce17" table:formula="of:=ROUND([.A34];12)=ROUND([.B34];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> @@ -3720,11 +3720,11 @@ <table:table-cell table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro7"> - <table:table-cell table:formula="of:=BETADIST([.I37];[.$J$13];[.$J$14];0;1;FALSE())" office:value-type="float" office:value="6468148.8473596" calcext:value-type="float"> - <text:p>6468148.8473596</text:p> + <table:table-cell table:formula="of:=BETADIST([.I37];[.$J$13];[.$J$14];0;1;FALSE())" office:value-type="float" office:value="6468199.11488617" calcext:value-type="float"> + <text:p>6468199.11488617</text:p> </table:table-cell> - <table:table-cell table:style-name="ce14" office:value-type="float" office:value="6468148.8473596" calcext:value-type="float"> - <text:p>6468148.847360</text:p> + <table:table-cell table:style-name="ce14" office:value-type="float" office:value="6468199.11488617" calcext:value-type="float"> + <text:p>6468199.11488617</text:p> </table:table-cell> <table:table-cell table:style-name="ce17" table:formula="of:=ROUND([.A36];12)=ROUND([.B36];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> @@ -3749,11 +3749,11 @@ <table:table-cell table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro7"> - <table:table-cell table:formula="of:=BETADIST([.I38];[.$J$13];[.$J$14];0;1;FALSE())" office:value-type="float" office:value="162564790.351024" calcext:value-type="float"> - <text:p>162564790.351024</text:p> + <table:table-cell table:formula="of:=BETADIST([.I38];[.$J$13];[.$J$14];0;1;FALSE())" office:value-type="float" office:value="162438470.365225" calcext:value-type="float"> + <text:p>162438470.365225</text:p> </table:table-cell> - <table:table-cell office:value-type="float" office:value="162564790.351024" calcext:value-type="float"> - <text:p>162564790.351024</text:p> + <table:table-cell office:value-type="float" office:value="162438470.365225" calcext:value-type="float"> + <text:p>162438470.365225</text:p> </table:table-cell> <table:table-cell table:style-name="ce17" table:formula="of:=ROUND([.A37];12)=ROUND([.B37];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> @@ -3777,11 +3777,11 @@ <table:table-cell table:number-columns-repeated="3"/> </table:table-row> <table:table-row table:style-name="ro7"> - <table:table-cell table:formula="of:=BETADIST([.I39];[.$J$13];[.$J$14];0;1;FALSE())" office:value-type="float" office:value="4434383544.877" calcext:value-type="float"> - <text:p>4434383544.877</text:p> + <table:table-cell table:formula="of:=BETADIST([.I39];[.$J$13];[.$J$14];0;1;FALSE())" office:value-type="float" office:value="4083442911.23905" calcext:value-type="float"> + <text:p>4083442911.23905</text:p> </table:table-cell> - <table:table-cell office:value-type="float" office:value="4434383544.877" calcext:value-type="float"> - <text:p>4434383544.877</text:p> + <table:table-cell office:value-type="float" office:value="4083442911.23905" calcext:value-type="float"> + <text:p>4083442911.23905</text:p> </table:table-cell> <table:table-cell table:style-name="ce17" table:formula="of:=ROUND([.A38];12)=ROUND([.B38];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> @@ -4861,11 +4861,11 @@ <table:table-cell table:number-columns-repeated="19"/> </table:table-row> <table:table-row table:style-name="ro7"> - <table:table-cell table:formula="of:=BETADIST([.I84];[.$J$68];[.$J$69];0;1;FALSE())" office:value-type="float" office:value="90528.0025044751" calcext:value-type="float"> - <text:p>90528.0025044751</text:p> + <table:table-cell table:formula="of:=BETADIST([.I84];[.$J$68];[.$J$69];0;1;FALSE())" office:value-type="float" office:value="90528.00257483" calcext:value-type="float"> + <text:p>90528.00257483</text:p> </table:table-cell> - <table:table-cell table:style-name="ce14" office:value-type="float" office:value="90528.0025044751" calcext:value-type="float"> - <text:p>90528.002504</text:p> + <table:table-cell table:style-name="ce14" office:value-type="float" office:value="90528.00257483" calcext:value-type="float"> + <text:p>90528.00257483</text:p> </table:table-cell> <table:table-cell table:style-name="ce17" table:formula="of:=ROUND([.A81];12)=ROUND([.B81];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> @@ -4903,11 +4903,11 @@ <table:table-cell table:number-columns-repeated="19"/> </table:table-row> <table:table-row table:style-name="ro7"> - <table:table-cell table:formula="of:=BETADIST([.I86];[.$J$68];[.$J$69];0;1;FALSE())" office:value-type="float" office:value="57119197.8430585" calcext:value-type="float"> - <text:p>57119197.8430585</text:p> + <table:table-cell table:formula="of:=BETADIST([.I86];[.$J$68];[.$J$69];0;1;FALSE())" office:value-type="float" office:value="57119641.747623" calcext:value-type="float"> + <text:p>57119641.747623</text:p> </table:table-cell> - <table:table-cell table:style-name="ce14" office:value-type="float" office:value="57119197.8430585" calcext:value-type="float"> - <text:p>57119197.843059</text:p> + <table:table-cell table:style-name="ce14" office:value-type="float" office:value="57119641.747623" calcext:value-type="float"> + <text:p>57119641.747623</text:p> </table:table-cell> <table:table-cell table:style-name="ce17" table:formula="of:=ROUND([.A83];12)=ROUND([.B83];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> @@ -4924,11 +4924,11 @@ <table:table-cell table:number-columns-repeated="19"/> </table:table-row> <table:table-row table:style-name="ro7"> - <table:table-cell table:formula="of:=BETADIST([.I87];[.$J$68];[.$J$69];0;1;FALSE())" office:value-type="float" office:value="1435583912.33735" calcext:value-type="float"> - <text:p>1435583912.33735</text:p> + <table:table-cell table:formula="of:=BETADIST([.I87];[.$J$68];[.$J$69];0;1;FALSE())" office:value-type="float" office:value="1434468400.5526" calcext:value-type="float"> + <text:p>1434468400.5526</text:p> </table:table-cell> - <table:table-cell table:style-name="ce14" office:value-type="float" office:value="1435583912.33735" calcext:value-type="float"> - <text:p>1435583912.337350</text:p> + <table:table-cell table:style-name="ce14" office:value-type="float" office:value="1434468400.5526" calcext:value-type="float"> + <text:p>1434468400.5526</text:p> </table:table-cell> <table:table-cell table:style-name="ce17" table:formula="of:=ROUND([.A84];12)=ROUND([.B84];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> @@ -4945,11 +4945,11 @@ <table:table-cell table:number-columns-repeated="19"/> </table:table-row> <table:table-row table:style-name="ro7"> - <table:table-cell table:formula="of:=BETADIST([.I88];[.$J$68];[.$J$69];0;1;FALSE())" office:value-type="float" office:value="39159338651.6891" calcext:value-type="float"> - <text:p>39159338651.6891</text:p> + <table:table-cell table:formula="of:=BETADIST([.I88];[.$J$68];[.$J$69];0;1;FALSE())" office:value-type="float" office:value="36060237507.1468" calcext:value-type="float"> + <text:p>36060237507.1468</text:p> </table:table-cell> - <table:table-cell table:style-name="ce14" office:value-type="float" office:value="39159338651.6891" calcext:value-type="float"> - <text:p>39159338651.689100</text:p> + <table:table-cell table:style-name="ce14" office:value-type="float" office:value="36060237507.1468" calcext:value-type="float"> + <text:p>36060237507.1468</text:p> </table:table-cell> <table:table-cell table:style-name="ce17" table:formula="of:=ROUND([.A85];12)=ROUND([.B85];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> diff --git a/sc/qa/unit/data/functions/statistical/fods/chiinv.fods b/sc/qa/unit/data/functions/statistical/fods/chiinv.fods index d8c1cf930361..fa107b013cdd 100644 --- a/sc/qa/unit/data/functions/statistical/fods/chiinv.fods +++ b/sc/qa/unit/data/functions/statistical/fods/chiinv.fods @@ -2925,11 +2925,11 @@ <table:table-cell/> </table:table-row> <table:table-row table:style-name="ro7"> - <table:table-cell table:formula="of:=LEGACY.CHIINV([.F8];[.G8])" office:value-type="float" office:value="0.005035400390625" calcext:value-type="float"> - <text:p>0.005035400390625</text:p> + <table:table-cell table:formula="of:=LEGACY.CHIINV([.F8];[.G8])" office:value-type="float" office:value="0.00518798828125" calcext:value-type="float"> + <text:p>0.00518798828125</text:p> </table:table-cell> - <table:table-cell office:value-type="float" office:value="0.005035400390625" calcext:value-type="float"> - <text:p>0.005035400390625</text:p> + <table:table-cell office:value-type="float" office:value="0.00518798828125" calcext:value-type="float"> + <text:p>0.00518798828125</text:p> </table:table-cell> <table:table-cell table:style-name="ce15" table:formula="of:=ROUND([.A8];12)=ROUND([.B8];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> diff --git a/sc/qa/unit/data/functions/statistical/fods/forecast.ets.mult.fods b/sc/qa/unit/data/functions/statistical/fods/forecast.ets.mult.fods index 37aa304d199b..9741ba7dc9a2 100644 --- a/sc/qa/unit/data/functions/statistical/fods/forecast.ets.mult.fods +++ b/sc/qa/unit/data/functions/statistical/fods/forecast.ets.mult.fods @@ -7804,7 +7804,7 @@ <table:table-cell office:value-type="float" office:value="61.9729295871504" calcext:value-type="float"> <text:p>61.9729295871504</text:p> </table:table-cell> - <table:table-cell table:style-name="ce14" office:value-type="float" office:value="61.9729295871504" calcext:value-type="float"> + <table:table-cell table:style-name="ce14" office:value-type="float" office:value="61.97292958715045" calcext:value-type="float"> <text:p>61.972930</text:p> </table:table-cell> <table:table-cell table:style-name="ce16" table:formula="of:=ROUND([.A49];12)=ROUND([.B49];12)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> diff --git a/sc/qa/unit/data/functions/statistical/fods/tinv.fods b/sc/qa/unit/data/functions/statistical/fods/tinv.fods index 89832a2a16c3..99d93baa3311 100644 --- a/sc/qa/unit/data/functions/statistical/fods/tinv.fods +++ b/sc/qa/unit/data/functions/statistical/fods/tinv.fods @@ -4608,11 +4608,11 @@ <table:table-cell table:number-columns-repeated="2"/> </table:table-row> <table:table-row table:style-name="ro6"> - <table:table-cell table:style-name="ce77" office:value-type="float" office:value="0.148831111963765" calcext:value-type="float"> - <text:p>1.48831111963765E-001</text:p> + <table:table-cell table:style-name="ce77" office:value-type="float" office:value="0.148831111963764" calcext:value-type="float"> + <text:p>1.48831111963764E-001</text:p> </table:table-cell> - <table:table-cell office:value-type="float" office:value="0.148831111963765" calcext:value-type="float"> - <text:p>0.148831111963765</text:p> + <table:table-cell office:value-type="float" office:value="0.148831111963764" calcext:value-type="float"> + <text:p>0.148831111963764</text:p> </table:table-cell> <table:table-cell table:style-name="ce79" table:formula="of:=ORG.LIBREOFFICE.ROUNDSIG([.A29];15)=ORG.LIBREOFFICE.ROUNDSIG([.B29];15)" office:value-type="boolean" office:boolean-value="true" calcext:value-type="boolean"> <text:p>TRUE</text:p> |