make test a bit faster by removing large AFs

aewallin · Mar 31, 2016 · c3e02a0 · c3e02a0
1 parent 88a62d0
commit c3e02a0
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 23 deletions.
diff --git a/tests/phasedat/phase_dat_htotdev_octave.txt b/tests/phasedat/phase_dat_htotdev_octave.txt
@@ -13,7 +13,7 @@
     4   4.0000e+00      989     0   1.3744e-01    1.4252e-01     1.4821e-01
     8   8.0000e+00      977     0   1.0303e-01    1.0822e-01     1.1430e-01
    16   1.6000e+01      953     0   6.1280e-02    6.5265e-02     7.0151e-02
-   32   3.2000e+01      905     0   4.0870e-02    4.4644e-02     4.9703e-02
-   64   6.4000e+01      809     0   2.9694e-02    3.3576e-02     3.9530e-02
-  128   1.2800e+02      617     1   2.6309e-02    2.8790e-02     3.2137e-02
-  256   2.5600e+02      233     1   1.2846e-02    1.4773e-02     1.7946e-02
+#   32   3.2000e+01      905     0   4.0870e-02    4.4644e-02     4.9703e-02
+#   64   6.4000e+01      809     0   2.9694e-02    3.3576e-02     3.9530e-02
+#  128   1.2800e+02      617     1   2.6309e-02    2.8790e-02     3.2137e-02
+#  256   2.5600e+02      233     1   1.2846e-02    1.4773e-02     1.7946e-02
diff --git a/tests/phasedat/phase_dat_mtotdev_octave.txt b/tests/phasedat/phase_dat_mtotdev_octave.txt
@@ -13,7 +13,7 @@
     4   4.0000e+00      990     0   9.0598e-02    9.4613e-02     9.9218e-02
     8   8.0000e+00      978     0   6.1866e-02    6.5721e-02     7.0406e-02
    16   1.6000e+01      954     0   3.4536e-02    3.7135e-02     4.0425e-02
-   32   3.2000e+01      906     0   2.6331e-02    2.9114e-02     3.3017e-02
-   64   6.4000e+01      810     0   2.0550e-02    2.3606e-02     2.8612e-02
-  128   1.2800e+02      618     1   1.3978e-02    1.6668e-02     2.1915e-02
-  256   2.5600e+02      234     1   4.6190e-03    5.9607e-03     1.0238e-02
+#   32   3.2000e+01      906     0   2.6331e-02    2.9114e-02     3.3017e-02
+#   64   6.4000e+01      810     0   2.0550e-02    2.3606e-02     2.8612e-02
+#  128   1.2800e+02      618     1   1.3978e-02    1.6668e-02     2.1915e-02
+#  256   2.5600e+02      234     1   4.6190e-03    5.9607e-03     1.0238e-02
diff --git a/tests/phasedat/phase_dat_test.py b/tests/phasedat/phase_dat_test.py
@@ -27,18 +27,13 @@ def run():
 
     data_file = 'PHASE.DAT'
 
-    #theo1_result = 'phase_dat_theo1.txt'
     theo1_result = 'phase_dat_theo1_alpha0.txt' # should have no bias-correction?
 
     htotdev_result = 'phase_dat_htotdev_octave.txt'
 
-    ttotdev_result1 = 'phase_dat_ttotdev_octave.txt'
-    #ttotdev_result2 = 'phase_dat_ttotdev_decade.txt'
-    #ttotdev_result3 = 'phase_dat_ttotdev_all.txt'
+    ttotdev_result = 'phase_dat_ttotdev_octave.txt'
 
-    #mtotdev_result1 = 'phase_dat_mtotdev_decade.txt'
-    mtotdev_result2 = 'phase_dat_mtotdev_octave.txt'
-    #mtotdev_result3 = 'phase_dat_mtotdev.txt'
+    mtotdev_result = 'phase_dat_mtotdev_octave.txt'
 
     adev_result = 'phase_dat_adev.txt'
     oadev_result = 'phase_dat_oadev.txt'
@@ -57,11 +52,10 @@ def run():
 
     testutils.test_row_by_row( allan.htotdev, data_file, 1.0, htotdev_result , verbose=verbose, tolerance=tolerance)
 
-    testutils.test_row_by_row( allan.ttotdev, data_file, 1.0, ttotdev_result2 , verbose=verbose, tolerance=tolerance)
-    testutils.test_row_by_row( allan.ttotdev, data_file, 1.0, ttotdev_result1 , verbose=verbose, tolerance=tolerance)
+    testutils.test_row_by_row( allan.ttotdev, data_file, 1.0, ttotdev_result , verbose=verbose, tolerance=tolerance)
+
+    testutils.test_row_by_row( allan.mtotdev, data_file, 1.0, mtotdev_result , verbose=verbose, tolerance=tolerance)
 
-    testutils.test_row_by_row( allan.mtotdev, data_file, 1.0, mtotdev_result1 , verbose=verbose, tolerance=tolerance)
-    testutils.test_row_by_row( allan.mtotdev, data_file, 1.0, mtotdev_result2 , verbose=verbose, tolerance=tolerance)
     testutils.test( allan.adev, data_file, 1.0, adev_result , verbose=verbose, tolerance=tolerance)
     testutils.test( allan.oadev, data_file, 1.0, oadev_result, verbose=verbose, tolerance=tolerance )
     testutils.test( allan.mdev, data_file, 1.0, mdev_result, verbose=verbose, tolerance=tolerance )

diff --git a/tests/phasedat/phase_dat_ttotdev_octave.txt b/tests/phasedat/phase_dat_ttotdev_octave.txt
@@ -13,7 +13,7 @@
     4   4.0000e+00      990     0   2.0923e-01    2.1850e-01     2.2913e-01
     8   8.0000e+00      978     0   2.8575e-01    3.0355e-01     3.2519e-01
    16   1.6000e+01      954     0   3.1903e-01    3.4304e-01     3.7343e-01
-   32   3.2000e+01      906     0   4.8647e-01    5.3788e-01     6.1000e-01
-   64   6.4000e+01      810     0   7.5934e-01    8.7227e-01     1.0572e+00
-  128   1.2800e+02      618     1   1.0330e+00    1.2318e+00     1.6195e+00
-  256   2.5600e+02      234     1   6.8269e-01    8.8101e-01     1.5131e+00
+#   32   3.2000e+01      906     0   4.8647e-01    5.3788e-01     6.1000e-01
+#   64   6.4000e+01      810     0   7.5934e-01    8.7227e-01     1.0572e+00
+#  128   1.2800e+02      618     1   1.0330e+00    1.2318e+00     1.6195e+00
+#  256   2.5600e+02      234     1   6.8269e-01    8.8101e-01     1.5131e+00