Improved the testing of our Python interface.

The idea is to have only one output file per Python test (as opposed to one for each platform and each release/debug mode).
opencor · Aug 10, 2020 · ef3a639 · ef3a639
1 parent 14ae94e
commit ef3a639
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 40 deletions.
diff --git a/src/plugins/support/PythonSupport/tests/data/hodgkinhuxley1952tests.out b/src/plugins/support/PythonSupport/tests/data/hodgkinhuxley1952tests.out
@@ -12,15 +12,15 @@
        - potassium_channel/E_K = [ 12.0, 12.0, 12.0, ..., 12.0, 12.0, 12.0 ]
        - leakage_current/E_L = [ -10.6, -10.6, -10.6, ..., -10.6, -10.6, -10.6 ]
     - States:
-       - membrane/V = [ 0.0, 0.3, 0.4, ..., -0.0, -0.0, -0.0 ]
+       - membrane/V = [ 0.0, 0.3, 0.4, ..., 0.0, 0.0, 0.0 ]
        - sodium_channel/sodium_channel_m_gate/m = [ 0.1, 0.1, 0.1, ..., 0.1, 0.1, 0.1 ]
        - sodium_channel/sodium_channel_h_gate/h = [ 0.6, 0.6, 0.6, ..., 0.6, 0.6, 0.6 ]
        - potassium_channel/potassium_channel_n_gate/n = [ 0.3, 0.3, 0.3, ..., 0.3, 0.3, 0.3 ]
     - Rates:
-       - membrane/V/prime = [ 0.6, 0.2, 0.1, ..., -0.0, -0.0, -0.0 ]
-       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.0, -0.0, -0.0, ..., 0.0, 0.0, 0.0 ]
-       - sodium_channel/sodium_channel_h_gate/h/prime = [ -0.0, 0.0, 0.0, ..., -0.0, -0.0, -0.0 ]
-       - potassium_channel/potassium_channel_n_gate/n/prime = [ -0.0, -0.0, -0.0, ..., 0.0, 0.0, 0.0 ]
+       - membrane/V/prime = [ 0.6, 0.2, 0.1, ..., 0.0, 0.0, 0.0 ]
+       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
+       - sodium_channel/sodium_channel_h_gate/h/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
+       - potassium_channel/potassium_channel_n_gate/n/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
     - Algebraic:
        - membrane/i_Stim = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
        - sodium_channel/sodium_channel_m_gate/alpha_m = [ 0.2, 0.2, 0.2, ..., 0.2, 0.2, 0.2 ]
@@ -43,15 +43,15 @@
        - potassium_channel/E_K = [ 12.0, 12.0, 12.0, ..., 12.0, 12.0, 12.0 ]
        - leakage_current/E_L = [ -10.6, -10.6, -10.6, ..., -10.6, -10.6, -10.6 ]
     - States:
-       - membrane/V = [ 0.0, 0.3, 0.4, ..., -0.0, -0.0, -0.0 ]
+       - membrane/V = [ 0.0, 0.3, 0.4, ..., 0.0, 0.0, 0.0 ]
        - sodium_channel/sodium_channel_m_gate/m = [ 0.1, 0.1, 0.1, ..., 0.1, 0.1, 0.1 ]
        - sodium_channel/sodium_channel_h_gate/h = [ 0.6, 0.6, 0.6, ..., 0.6, 0.6, 0.6 ]
        - potassium_channel/potassium_channel_n_gate/n = [ 0.3, 0.3, 0.3, ..., 0.3, 0.3, 0.3 ]
     - Rates:
-       - membrane/V/prime = [ 0.6, 0.2, 0.1, ..., 0.0, 0.0, -0.0 ]
-       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.0, -0.0, -0.0, ..., -0.0, -0.0, -0.0 ]
-       - sodium_channel/sodium_channel_h_gate/h/prime = [ -0.0, 0.0, 0.0, ..., -0.0, -0.0, -0.0 ]
-       - potassium_channel/potassium_channel_n_gate/n/prime = [ -0.0, -0.0, -0.0, ..., -0.0, -0.0, -0.0 ]
+       - membrane/V/prime = [ 0.6, 0.2, 0.1, ..., 0.0, 0.0, 0.0 ]
+       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
+       - sodium_channel/sodium_channel_h_gate/h/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
+       - potassium_channel/potassium_channel_n_gate/n/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
     - Algebraic:
        - membrane/i_Stim = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
        - sodium_channel/sodium_channel_m_gate/alpha_m = [ 0.2, 0.2, 0.2, ..., 0.2, 0.2, 0.2 ]
@@ -74,15 +74,15 @@
        - potassium_channel/E_K = [ 12.0, 12.0, 12.0, ..., 12.0, 12.0, 12.0 ]
        - leakage_current/E_L = [ -10.6, -10.6, -10.6, ..., -10.6, -10.6, -10.6 ]
     - States:
-       - membrane/V = [ 0.0, 0.3, 0.4, ..., -0.0, -0.0, -0.0 ]
+       - membrane/V = [ 0.0, 0.3, 0.4, ..., 0.0, 0.0, 0.0 ]
        - sodium_channel/sodium_channel_m_gate/m = [ 0.1, 0.1, 0.1, ..., 0.1, 0.1, 0.1 ]
        - sodium_channel/sodium_channel_h_gate/h = [ 0.6, 0.6, 0.6, ..., 0.6, 0.6, 0.6 ]
        - potassium_channel/potassium_channel_n_gate/n = [ 0.3, 0.3, 0.3, ..., 0.3, 0.3, 0.3 ]
     - Rates:
        - membrane/V/prime = [ 0.6, 0.2, 0.1, ..., 0.0, 0.0, 0.0 ]
-       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.0, -0.0, -0.0, ..., -0.0, -0.0, -0.0 ]
-       - sodium_channel/sodium_channel_h_gate/h/prime = [ -0.0, 0.0, 0.0, ..., -0.0, -0.0, -0.0 ]
-       - potassium_channel/potassium_channel_n_gate/n/prime = [ -0.0, -0.0, -0.0, ..., -0.0, -0.0, -0.0 ]
+       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
+       - sodium_channel/sodium_channel_h_gate/h/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
+       - potassium_channel/potassium_channel_n_gate/n/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
     - Algebraic:
        - membrane/i_Stim = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
        - sodium_channel/sodium_channel_m_gate/alpha_m = [ 0.2, 0.2, 0.2, ..., 0.2, 0.2, 0.2 ]
@@ -105,15 +105,15 @@
        - potassium_channel/E_K = [ 12.0, 12.0, 12.0, ..., 12.0, 12.0, 12.0 ]
        - leakage_current/E_L = [ -10.6, -10.6, -10.6, ..., -10.6, -10.6, -10.6 ]
     - States:
-       - membrane/V = [ 0.0, 0.3, 0.4, ..., -0.0, -0.0, -0.0 ]
+       - membrane/V = [ 0.0, 0.3, 0.4, ..., 0.0, 0.0, 0.0 ]
        - sodium_channel/sodium_channel_m_gate/m = [ 0.1, 0.1, 0.1, ..., 0.1, 0.1, 0.1 ]
        - sodium_channel/sodium_channel_h_gate/h = [ 0.6, 0.6, 0.6, ..., 0.6, 0.6, 0.6 ]
        - potassium_channel/potassium_channel_n_gate/n = [ 0.3, 0.3, 0.3, ..., 0.3, 0.3, 0.3 ]
     - Rates:
-       - membrane/V/prime = [ 0.6, 0.2, 0.1, ..., -0.0, 0.0, -0.0 ]
-       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.0, -0.0, -0.0, ..., -0.0, -0.0, -0.0 ]
-       - sodium_channel/sodium_channel_h_gate/h/prime = [ -0.0, 0.0, 0.0, ..., -0.0, -0.0, -0.0 ]
-       - potassium_channel/potassium_channel_n_gate/n/prime = [ -0.0, -0.0, -0.0, ..., -0.0, -0.0, -0.0 ]
+       - membrane/V/prime = [ 0.6, 0.2, 0.1, ..., 0.0, 0.0, 0.0 ]
+       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
+       - sodium_channel/sodium_channel_h_gate/h/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
+       - potassium_channel/potassium_channel_n_gate/n/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
     - Algebraic:
        - membrane/i_Stim = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
        - sodium_channel/sodium_channel_m_gate/alpha_m = [ 0.2, 0.2, 0.2, ..., 0.2, 0.2, 0.2 ]
@@ -136,15 +136,15 @@
        - potassium_channel/E_K = [ 12.0, 12.0, 12.0, ..., 12.0, 12.0, 12.0 ]
        - leakage_current/E_L = [ -10.6, -10.6, -10.6, ..., -10.6, -10.6, -10.6 ]
     - States:
-       - membrane/V = [ 0.0, 0.3, 0.4, ..., -0.0, -0.0, -0.0 ]
+       - membrane/V = [ 0.0, 0.3, 0.4, ..., 0.0, 0.0, 0.0 ]
        - sodium_channel/sodium_channel_m_gate/m = [ 0.1, 0.1, 0.1, ..., 0.1, 0.1, 0.1 ]
        - sodium_channel/sodium_channel_h_gate/h = [ 0.6, 0.6, 0.6, ..., 0.6, 0.6, 0.6 ]
        - potassium_channel/potassium_channel_n_gate/n = [ 0.3, 0.3, 0.3, ..., 0.3, 0.3, 0.3 ]
     - Rates:
        - membrane/V/prime = [ 0.6, 0.2, 0.1, ..., 0.0, 0.0, 0.0 ]
-       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.0, -0.0, -0.0, ..., -0.0, -0.0, -0.0 ]
-       - sodium_channel/sodium_channel_h_gate/h/prime = [ -0.0, 0.0, 0.0, ..., -0.0, -0.0, -0.0 ]
-       - potassium_channel/potassium_channel_n_gate/n/prime = [ -0.0, -0.0, -0.0, ..., -0.0, -0.0, -0.0 ]
+       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
+       - sodium_channel/sodium_channel_h_gate/h/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
+       - potassium_channel/potassium_channel_n_gate/n/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
     - Algebraic:
        - membrane/i_Stim = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
        - sodium_channel/sodium_channel_m_gate/alpha_m = [ 0.2, 0.2, 0.2, ..., 0.2, 0.2, 0.2 ]

diff --git a/src/plugins/support/PythonSupport/tests/data/noble1962tests.out b/src/plugins/support/PythonSupport/tests/data/noble1962tests.out
@@ -15,9 +15,9 @@
        - potassium_channel/potassium_channel_n_gate/n = [ 0.0, 0.0, 0.0, ..., 0.7, 0.7, 0.7 ]
     - Rates:
        - membrane/V/prime = [ 0.4, 0.5, 0.5, ..., -0.7, -0.7, -0.7 ]
-       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.2, 0.0, 0.0, ..., -0.0, -0.0, -0.0 ]
+       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.2, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
        - sodium_channel/sodium_channel_h_gate/h/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
-       - potassium_channel/potassium_channel_n_gate/n/prime = [ 0.0, 0.0, 0.0, ..., -0.0, -0.0, -0.0 ]
+       - potassium_channel/potassium_channel_n_gate/n/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
     - Algebraic:
        - sodium_channel/g_Na = [ 0.0, 0.0, 0.0, ..., 0.3, 0.3, 0.3 ]
        - sodium_channel/sodium_channel_m_gate/alpha_m = [ 0.3, 0.3, 0.3, ..., 2.0, 1.9, 1.9 ]
@@ -45,9 +45,9 @@
        - potassium_channel/potassium_channel_n_gate/n = [ 0.0, 0.0, 0.0, ..., 0.7, 0.7, 0.7 ]
     - Rates:
        - membrane/V/prime = [ 0.4, 0.5, 0.5, ..., -0.7, -0.7, -0.7 ]
-       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.2, 0.0, 0.0, ..., -0.0, -0.0, -0.0 ]
+       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.2, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
        - sodium_channel/sodium_channel_h_gate/h/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
-       - potassium_channel/potassium_channel_n_gate/n/prime = [ 0.0, 0.0, 0.0, ..., -0.0, -0.0, -0.0 ]
+       - potassium_channel/potassium_channel_n_gate/n/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
     - Algebraic:
        - sodium_channel/g_Na = [ 0.0, 0.0, 0.0, ..., 0.3, 0.3, 0.3 ]
        - sodium_channel/sodium_channel_m_gate/alpha_m = [ 0.3, 0.3, 0.3, ..., 2.0, 1.9, 1.9 ]
@@ -75,9 +75,9 @@
        - potassium_channel/potassium_channel_n_gate/n = [ 0.0, 0.0, 0.0, ..., 0.7, 0.7, 0.7 ]
     - Rates:
        - membrane/V/prime = [ 0.4, 0.5, 0.5, ..., -0.7, -0.7, -0.7 ]
-       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.2, 0.0, 0.0, ..., -0.0, -0.0, -0.0 ]
+       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.2, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
        - sodium_channel/sodium_channel_h_gate/h/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
-       - potassium_channel/potassium_channel_n_gate/n/prime = [ 0.0, 0.0, 0.0, ..., -0.0, -0.0, -0.0 ]
+       - potassium_channel/potassium_channel_n_gate/n/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
     - Algebraic:
        - sodium_channel/g_Na = [ 0.0, 0.0, 0.0, ..., 0.3, 0.3, 0.3 ]
        - sodium_channel/sodium_channel_m_gate/alpha_m = [ 0.3, 0.3, 0.3, ..., 2.0, 1.9, 1.9 ]
@@ -105,9 +105,9 @@
        - potassium_channel/potassium_channel_n_gate/n = [ 0.0, 0.0, 0.0, ..., 0.7, 0.7, 0.7 ]
     - Rates:
        - membrane/V/prime = [ 0.4, 0.5, 0.5, ..., -0.7, -0.7, -0.7 ]
-       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.2, 0.0, 0.0, ..., -0.0, -0.0, -0.0 ]
+       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.2, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
        - sodium_channel/sodium_channel_h_gate/h/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
-       - potassium_channel/potassium_channel_n_gate/n/prime = [ 0.0, 0.0, 0.0, ..., -0.0, -0.0, -0.0 ]
+       - potassium_channel/potassium_channel_n_gate/n/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
     - Algebraic:
        - sodium_channel/g_Na = [ 0.0, 0.0, 0.0, ..., 0.3, 0.3, 0.3 ]
        - sodium_channel/sodium_channel_m_gate/alpha_m = [ 0.3, 0.3, 0.3, ..., 2.0, 1.9, 1.9 ]
@@ -135,9 +135,9 @@
        - potassium_channel/potassium_channel_n_gate/n = [ 0.0, 0.0, 0.0, ..., 0.7, 0.7, 0.7 ]
     - Rates:
        - membrane/V/prime = [ 0.4, 0.5, 0.5, ..., -0.7, -0.7, -0.7 ]
-       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.2, 0.0, 0.0, ..., -0.0, -0.0, -0.0 ]
+       - sodium_channel/sodium_channel_m_gate/m/prime = [ 0.2, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
        - sodium_channel/sodium_channel_h_gate/h/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
-       - potassium_channel/potassium_channel_n_gate/n/prime = [ 0.0, 0.0, 0.0, ..., -0.0, -0.0, -0.0 ]
+       - potassium_channel/potassium_channel_n_gate/n/prime = [ 0.0, 0.0, 0.0, ..., 0.0, 0.0, 0.0 ]
     - Algebraic:
        - sodium_channel/g_Na = [ 0.0, 0.0, 0.0, ..., 0.3, 0.3, 0.3 ]
        - sodium_channel/sodium_channel_m_gate/alpha_m = [ 0.3, 0.3, 0.3, ..., 2.0, 1.9, 1.9 ]

diff --git a/src/plugins/support/PythonSupport/tests/data/utils.py b/src/plugins/support/PythonSupport/tests/data/utils.py
@@ -29,11 +29,13 @@ def open_simulation(file_name_or_url):
     return simulation
 
 
-def true_value(value):
-    if value == 0.0:
-        return 0.0
+def str_value(value):
+    res = format(value, '.1f')
+
+    if res == '-0.0':
+        return '0.0'
     else:
-        return value
+        return res
 
 
 def print_values(data):
@@ -42,9 +44,9 @@ def print_values(data):
     else:
         data_len = len(data)
 
-        print('[ %.1f, %.1f, %.1f, ..., %.1f, %.1f, %.1f ]'
-              % (true_value(data[0]), true_value(data[1]), true_value(data[2]),
-                 true_value(data[data_len - 3]), true_value(data[data_len - 2]), true_value(data[data_len - 1])))
+        print('[ %s, %s, %s, ..., %s, %s, %s ]'
+              % (str_value(data[0]), str_value(data[1]), str_value(data[2]),
+                 str_value(data[data_len - 3]), str_value(data[data_len - 2]), str_value(data[data_len - 1])))
 
 
 def values(data, data_type, indent=''):