X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=blobdiff_plain;ds=sidebyside;f=tests%2Fmath%2Fchart-geometry.at;h=5a7d858f3c2a1fcdda53cd81fec642dc3effb614;hb=f50fd75b45786d9cd4f2c98d4076804d46795bec;hp=96bf02db736952bac2b61c7f717121e65120cc88;hpb=588b9791103a2aa7225f59a7b9490ed1da987adf;p=pspp
diff --git a/tests/math/chart-geometry.at b/tests/math/chart-geometry.at
index 96bf02db73..5a7d858f3c 100644
--- a/tests/math/chart-geometry.at
+++ b/tests/math/chart-geometry.at
@@ -1,66 +1,37 @@
AT_BANNER([Chart Geometry])
-AT_SETUP([Chart Rounding])
-
-AT_CHECK([../../math/chart-geometry-test], [0], [dnl
-0.00648687 0.005
-728815 500000
-8.14431e-07 0.000001
-77611.4 100000
-3.33497 2
-180.426 200
-0.676168 0.5
-2.00744e+08 200000000
-14099.3 10000
-19.5186 20
-1.17473e-07 0.0000001
-166337 200000
-0.00163644 0.002
-1.94724e-09 0.000000002
-2.31564e-06 0.000002
-3.10674e+06 2000000
-5.10314e-05 0.00005
-1.95101 2
-1.40884e+09 1000000000
-78217.6 100000
-])
-
-AT_CLEANUP
-
-
AT_SETUP([Chart Scale])
-
AT_CHECK([../../math/chart-get-scale-test], [0], [ignore])
-
AT_CLEANUP
-
AT_SETUP([Chart Ticks Format])
-
AT_CHECK([../../math/chart-get-ticks-format-test], [0], [dnl
-max: 1000, min: 10, nticks: 10, fs: %.0lf, scale: 1, example: 505
-max: 10000, min: 10, nticks: 10, fs: %.0lf, scale: 1, example: 5005
-max: 100000, min: 10, nticks: 10, fs: %.0lf, scale: 1, example: 50005
-max: 1e+06, min: 10, nticks: 10, fs: %.0lf, scale: 1, example: 500005
-max: 1e+07, min: 10, nticks: 10, fs: %.2lf∙107, scale: 1e-07, example: 0.50∙107
-max: 1e+08, min: 10, nticks: 10, fs: %.2lf∙108, scale: 1e-08, example: 0.50∙108
-max: 0.1, min: 0.01, nticks: 10, fs: %.3lf, scale: 1, example: 0.055
-max: 0.01, min: 0.001, nticks: 10, fs: %.4lf, scale: 1, example: 0.0055
-max: 0.001, min: 0.0001, nticks: 10, fs: %.5lf, scale: 1, example: 0.00055
-max: 0.0001, min: 1e-05, nticks: 10, fs: %.2lf∙10-5, scale: 100000, example: 5.50∙10-5
-max: 1e-05, min: 1e-07, nticks: 10, fs: %.2lf∙10-6, scale: 1e+06, example: 5.05∙10-6
-max: 1e-07, min: 1e-08, nticks: 10, fs: %.2lf∙10-8, scale: 1e+08, example: 5.50∙10-8
-max: 1.00001e-05, min: 1e-05, nticks: 10, fs: %.6lf∙10-5, scale: 100000, example: 1.000005∙10-5
-max: 1e+08, min: 1e+08, nticks: 10, fs: %.0lf, scale: 1, example: 100000005
-max: 100000, min: -500000, nticks: 10, fs: %.0lf, scale: 1, example: -200000
-max: 5, min: -5, nticks: 10, fs: %.0lf, scale: 1, example: 0
-max: 5, min: -4.999, nticks: 10, fs: %.1lf, scale: 1, example: 0.0
-max: 5, min: -4.999, nticks: 9, fs: %.0lf, scale: 1, example: 0
-max: 5, min: 0, nticks: 10, fs: %.1lf, scale: 1, example: 2.5
-max: 0, min: -5, nticks: 9, fs: %.1lf, scale: 1, example: -2.5
-max: 1.001e-95, min: 1e-95, nticks: 10, fs: %.5lf∙10-95, scale: 1e+95, example: 1.00050∙10-95
-max: 1.001e+98, min: 1e+98, nticks: 10, fs: %.5lf∙1098, scale: 1e-98, example: 1.00050∙1098
-max: 1.001e+33, min: 1e-22, nticks: 10, fs: %.2lf∙1033, scale: 1e-33, example: 0.50∙1033
+lower: 1000, interval: 10, nticks: 10, fs: %.0lf, scale: 1, ex: 1030, ex 2: 1040
+lower: 10000, interval: 10, nticks: 10, fs: %.0lf, scale: 1, ex: 10030, ex 2: 10040
+lower: 100000, interval: 10, nticks: 10, fs: %.0lf, scale: 1, ex: 100030, ex 2: 100040
+lower: 1e+06, interval: 10, nticks: 10, fs: %.0lf, scale: 1, ex: 1000030, ex 2: 1000040
+lower: 1e+07, interval: 10, nticks: 10, fs: %.0lf, scale: 1, ex: 10000030, ex 2: 10000040
+lower: 1e+08, interval: 10, nticks: 10, fs: %.0lf, scale: 1, ex: 100000030, ex 2: 100000040
+lower: 0.1, interval: 0.01, nticks: 10, fs: %.2lf, scale: 1, ex: 0.13, ex 2: 0.14
+lower: 0.01, interval: 0.001, nticks: 10, fs: %.3lf, scale: 1, ex: 0.013, ex 2: 0.014
+lower: 0.001, interval: 0.0001, nticks: 10, fs: %.4lf, scale: 1, ex: 0.0013, ex 2: 0.0014
+lower: 0.0001, interval: 1e-05, nticks: 10, fs: %.1lf×10-4, scale: 10000, ex: 1.3×10-4, ex 2: 1.4×10-4
+lower: 1e-05, interval: 1e-07, nticks: 10, fs: %.2lf×10-5, scale: 100000, ex: 1.03×10-5, ex 2: 1.04×10-5
+lower: 1e-07, interval: 1e-08, nticks: 10, fs: %.1lf×10-7, scale: 1e+07, ex: 1.3×10-7, ex 2: 1.4×10-7
+lower: -5, interval: 1, nticks: 10, fs: %.0lf, scale: 1, ex: -2, ex 2: -1
+lower: -5, interval: 0.5, nticks: 10, fs: %.1lf, scale: 1, ex: -3.5, ex 2: -3.0
+lower: -5, interval: 0.2, nticks: 9, fs: %.1lf, scale: 1, ex: -4.4, ex 2: -4.2
+lower: -5, interval: 2, nticks: 10, fs: %.0lf, scale: 1, ex: 1, ex 2: 3
+lower: -0.5, interval: 0.1, nticks: 9, fs: %.1lf, scale: 1, ex: -0.2, ex 2: -0.1
+lower: 9.75e+08, interval: 5e+06, nticks: 9, fs: %.3lf×109, scale: 1e-09, ex: 0.990×109, ex 2: 0.995×109
+lower: 9.7e+08, interval: 1e+07, nticks: 9, fs: %.2lf×109, scale: 1e-09, ex: 1.00×109, ex 2: 1.01×109
+lower: -4e+07, interval: 1e+07, nticks: 9, fs: %.0lf×107, scale: 1e-07, ex: -1×107, ex 2: 0×107
+lower: -3e+07, interval: 5e+06, nticks: 9, fs: %.1lf×107, scale: 1e-07, ex: -1.5×107, ex 2: -1.0×107
+lower: 1.001e-95, interval: 2e-99, nticks: 10, fs: %.4lf×10-95, scale: 1e+95, ex: 1.0016×10-95, ex 2: 1.0018×10-95
+lower: 1.001e+98, interval: 2e+94, nticks: 10, fs: %.4lf×1098, scale: 1e-98, ex: 1.0016×1098, ex 2: 1.0018×1098
+lower: 5984, interval: 1e-05, nticks: 10, fs: %.5lf, scale: 1, ex: 5984.00003, ex 2: 5984.00004
+lower: 3e+33, interval: 1e-22, nticks: 10, fs: %lg, scale: 1, ex: 3e+33, ex 2: 3e+33
+lower: 3e+33, interval: 1000, nticks: 10, fs: %.8lf×1033, scale: 1e-33, ex: 3.00000000×1033, ex 2: 3.00000000×1033
+lower: 0.1, interval: 2e-42, nticks: 10, fs: %.8lf, scale: 1, ex: 0.10000000, ex 2: 0.10000000
])
-
AT_CLEANUP