From: Tobias Oetiker Date: Mon, 18 Apr 2016 15:30:32 +0000 (+0200) Subject: fix expected results X-Git-Tag: v1.6.0~5^2 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=refs%2Fpull%2F708%2Fhead;p=thirdparty%2Frrdtool-1.x.git fix expected results --- diff --git a/tests/rpn2.output b/tests/rpn2.output index 9017f7e6..081bcc13 100644 --- a/tests/rpn2.output +++ b/tests/rpn2.output @@ -12,27 +12,35 @@ "month", "rmonth", "year", - "ryear" + "ryear", + "avg", + "smin", + "smax", + "med1", + "med2", + "p9", + "pow", + "stdev" ] }, "data": [ - [ 1.0000000e-01, 7.2000000e+02, 0.0000000e+00, 7.2000000e+02, 0.0000000e+00, 7.2000000e+02, 0.0000000e+00, 7.2000000e+02, 0.0000000e+00 ], - [ 1.0000000e-01, 1.4400000e+03, 0.0000000e+00, 1.4400000e+03, 0.0000000e+00, 1.4400000e+03, 0.0000000e+00, 1.4400000e+03, 0.0000000e+00 ], - [ 1.0000000e-01, 2.1600000e+03, 0.0000000e+00, 2.1600000e+03, 0.0000000e+00, 2.1600000e+03, 0.0000000e+00, 2.1600000e+03, 0.0000000e+00 ], - [ 1.0000000e-01, 2.8800000e+03, 0.0000000e+00, 2.8800000e+03, 0.0000000e+00, 2.8800000e+03, 0.0000000e+00, 2.8800000e+03, 0.0000000e+00 ], - [ 1.0000000e-01, 7.2000000e+02, 1.0000000e+00, 7.2000000e+02, 1.0000000e+00, 3.6000000e+03, 0.0000000e+00, 3.6000000e+03, 0.0000000e+00 ], - [ 1.0000000e-01, 1.4400000e+03, 0.0000000e+00, 1.4400000e+03, 0.0000000e+00, 4.3200000e+03, 0.0000000e+00, 4.3200000e+03, 0.0000000e+00 ], - [ 1.0000000e-01, 2.1600000e+03, 0.0000000e+00, 2.1600000e+03, 0.0000000e+00, 5.0400000e+03, 0.0000000e+00, 5.0400000e+03, 0.0000000e+00 ], - [ 1.0000000e-01, 2.8800000e+03, 0.0000000e+00, 2.8800000e+03, 0.0000000e+00, 5.7600000e+03, 0.0000000e+00, 5.7600000e+03, 0.0000000e+00 ], - [ 1.0000000e-01, 3.6000000e+03, 0.0000000e+00, 3.6000000e+03, 0.0000000e+00, 6.4800000e+03, 0.0000000e+00, 6.4800000e+03, 0.0000000e+00 ], - [ 1.0000000e-01, 4.3200000e+03, 0.0000000e+00, 4.3200000e+03, 0.0000000e+00, 7.2000000e+03, 0.0000000e+00, 7.2000000e+03, 0.0000000e+00 ], - [ 1.0000000e-01, 5.0400000e+03, 0.0000000e+00, 5.0400000e+03, 0.0000000e+00, 7.9200000e+03, 0.0000000e+00, 7.9200000e+03, 0.0000000e+00 ], - [ 1.0000000e-01, 5.7600000e+03, 0.0000000e+00, 5.7600000e+03, 0.0000000e+00, 8.6400000e+03, 0.0000000e+00, 8.6400000e+03, 0.0000000e+00 ], - [ 1.0000000e-01, 6.4800000e+03, 0.0000000e+00, 6.4800000e+03, 0.0000000e+00, 9.3600000e+03, 0.0000000e+00, 9.3600000e+03, 0.0000000e+00 ], - [ 1.0000000e-01, 7.2000000e+03, 0.0000000e+00, 7.2000000e+03, 0.0000000e+00, 1.0080000e+04, 0.0000000e+00, 1.0080000e+04, 0.0000000e+00 ], - [ 1.0000000e-01, 7.9200000e+03, 0.0000000e+00, 7.9200000e+03, 0.0000000e+00, 1.0800000e+04, 0.0000000e+00, 1.0800000e+04, 0.0000000e+00 ], - [ 1.0000000e-01, 8.6400000e+03, 0.0000000e+00, 8.6400000e+03, 0.0000000e+00, 1.1520000e+04, 0.0000000e+00, 1.1520000e+04, 0.0000000e+00 ], - [ 1.0000000e-01, 7.2000000e+02, 1.0000000e+00, 9.3600000e+03, 0.0000000e+00, 7.2000000e+02, 1.0000000e+00, 7.2000000e+02, 1.0000000e+00 ], - [ 1.0000000e-01, 1.4400000e+03, 0.0000000e+00, 1.0080000e+04, 0.0000000e+00, 1.4400000e+03, 0.0000000e+00, 1.4400000e+03, 0.0000000e+00 ] + [ 1.0000000e-01, 7.2000000e+02, 0.0000000e+00, 7.2000000e+02, 0.0000000e+00, 7.2000000e+02, 0.0000000e+00, 7.2000000e+02, 0.0000000e+00, 5.0000000e+00, 2.2000000e+00, 5.0000000e+00, 3.5000000e+00, 4.0000000e+00, 1.0000000e+01, 1.0000000e-02, 1.2151817e+00 ], + [ 1.0000000e-01, 1.4400000e+03, 0.0000000e+00, 1.4400000e+03, 0.0000000e+00, 1.4400000e+03, 0.0000000e+00, 1.4400000e+03, 0.0000000e+00, 5.0000000e+00, 2.2000000e+00, 5.0000000e+00, 3.5000000e+00, 4.0000000e+00, 1.0000000e+01, 1.0000000e-02, 1.2151817e+00 ], + [ 1.0000000e-01, 2.1600000e+03, 0.0000000e+00, 2.1600000e+03, 0.0000000e+00, 2.1600000e+03, 0.0000000e+00, 2.1600000e+03, 0.0000000e+00, 5.0000000e+00, 2.2000000e+00, 5.0000000e+00, 3.5000000e+00, 4.0000000e+00, 1.0000000e+01, 1.0000000e-02, 1.2151817e+00 ], + [ 1.0000000e-01, 2.8800000e+03, 0.0000000e+00, 2.8800000e+03, 0.0000000e+00, 2.8800000e+03, 0.0000000e+00, 2.8800000e+03, 0.0000000e+00, 5.0000000e+00, 2.2000000e+00, 5.0000000e+00, 3.5000000e+00, 4.0000000e+00, 1.0000000e+01, 1.0000000e-02, 1.2151817e+00 ], + [ 1.0000000e-01, 7.2000000e+02, 1.0000000e+00, 7.2000000e+02, 1.0000000e+00, 3.6000000e+03, 0.0000000e+00, 3.6000000e+03, 0.0000000e+00, 5.0000000e+00, 2.2000000e+00, 5.0000000e+00, 3.5000000e+00, 4.0000000e+00, 1.0000000e+01, 1.0000000e-02, 1.2151817e+00 ], + [ 1.0000000e-01, 1.4400000e+03, 0.0000000e+00, 1.4400000e+03, 0.0000000e+00, 4.3200000e+03, 0.0000000e+00, 4.3200000e+03, 0.0000000e+00, 5.0000000e+00, 2.2000000e+00, 5.0000000e+00, 3.5000000e+00, 4.0000000e+00, 1.0000000e+01, 1.0000000e-02, 1.2151817e+00 ], + [ 1.0000000e-01, 2.1600000e+03, 0.0000000e+00, 2.1600000e+03, 0.0000000e+00, 5.0400000e+03, 0.0000000e+00, 5.0400000e+03, 0.0000000e+00, 5.0000000e+00, 2.2000000e+00, 5.0000000e+00, 3.5000000e+00, 4.0000000e+00, 1.0000000e+01, 1.0000000e-02, 1.2151817e+00 ], + [ 1.0000000e-01, 2.8800000e+03, 0.0000000e+00, 2.8800000e+03, 0.0000000e+00, 5.7600000e+03, 0.0000000e+00, 5.7600000e+03, 0.0000000e+00, 5.0000000e+00, 2.2000000e+00, 5.0000000e+00, 3.5000000e+00, 4.0000000e+00, 1.0000000e+01, 1.0000000e-02, 1.2151817e+00 ], + [ 1.0000000e-01, 3.6000000e+03, 0.0000000e+00, 3.6000000e+03, 0.0000000e+00, 6.4800000e+03, 0.0000000e+00, 6.4800000e+03, 0.0000000e+00, 5.0000000e+00, 2.2000000e+00, 5.0000000e+00, 3.5000000e+00, 4.0000000e+00, 1.0000000e+01, 1.0000000e-02, 1.2151817e+00 ], + [ 1.0000000e-01, 4.3200000e+03, 0.0000000e+00, 4.3200000e+03, 0.0000000e+00, 7.2000000e+03, 0.0000000e+00, 7.2000000e+03, 0.0000000e+00, 5.0000000e+00, 2.2000000e+00, 5.0000000e+00, 3.5000000e+00, 4.0000000e+00, 1.0000000e+01, 1.0000000e-02, 1.2151817e+00 ], + [ 1.0000000e-01, 5.0400000e+03, 0.0000000e+00, 5.0400000e+03, 0.0000000e+00, 7.9200000e+03, 0.0000000e+00, 7.9200000e+03, 0.0000000e+00, 5.0000000e+00, 2.2000000e+00, 5.0000000e+00, 3.5000000e+00, 4.0000000e+00, 1.0000000e+01, 1.0000000e-02, 1.2151817e+00 ], + [ 1.0000000e-01, 5.7600000e+03, 0.0000000e+00, 5.7600000e+03, 0.0000000e+00, 8.6400000e+03, 0.0000000e+00, 8.6400000e+03, 0.0000000e+00, 5.0000000e+00, 2.2000000e+00, 5.0000000e+00, 3.5000000e+00, 4.0000000e+00, 1.0000000e+01, 1.0000000e-02, 1.2151817e+00 ], + [ 1.0000000e-01, 6.4800000e+03, 0.0000000e+00, 6.4800000e+03, 0.0000000e+00, 9.3600000e+03, 0.0000000e+00, 9.3600000e+03, 0.0000000e+00, 5.0000000e+00, 2.2000000e+00, 5.0000000e+00, 3.5000000e+00, 4.0000000e+00, 1.0000000e+01, 1.0000000e-02, 1.2151817e+00 ], + [ 1.0000000e-01, 7.2000000e+03, 0.0000000e+00, 7.2000000e+03, 0.0000000e+00, 1.0080000e+04, 0.0000000e+00, 1.0080000e+04, 0.0000000e+00, 5.0000000e+00, 2.2000000e+00, 5.0000000e+00, 3.5000000e+00, 4.0000000e+00, 1.0000000e+01, 1.0000000e-02, 1.2151817e+00 ], + [ 1.0000000e-01, 7.9200000e+03, 0.0000000e+00, 7.9200000e+03, 0.0000000e+00, 1.0800000e+04, 0.0000000e+00, 1.0800000e+04, 0.0000000e+00, 5.0000000e+00, 2.2000000e+00, 5.0000000e+00, 3.5000000e+00, 4.0000000e+00, 1.0000000e+01, 1.0000000e-02, 1.2151817e+00 ], + [ 1.0000000e-01, 8.6400000e+03, 0.0000000e+00, 8.6400000e+03, 0.0000000e+00, 1.1520000e+04, 0.0000000e+00, 1.1520000e+04, 0.0000000e+00, 5.0000000e+00, 2.2000000e+00, 5.0000000e+00, 3.5000000e+00, 4.0000000e+00, 1.0000000e+01, 1.0000000e-02, 1.2151817e+00 ], + [ 1.0000000e-01, 7.2000000e+02, 1.0000000e+00, 9.3600000e+03, 0.0000000e+00, 7.2000000e+02, 1.0000000e+00, 7.2000000e+02, 1.0000000e+00, 5.0000000e+00, 2.2000000e+00, 5.0000000e+00, 3.5000000e+00, 4.0000000e+00, 1.0000000e+01, 1.0000000e-02, 1.2151817e+00 ], + [ 1.0000000e-01, 1.4400000e+03, 0.0000000e+00, 1.0080000e+04, 0.0000000e+00, 1.4400000e+03, 0.0000000e+00, 1.4400000e+03, 0.0000000e+00, 5.0000000e+00, 2.2000000e+00, 5.0000000e+00, 3.5000000e+00, 4.0000000e+00, 1.0000000e+01, 1.0000000e-02, 1.2151817e+00 ] ] }