update C++ codebase for handling of feature dependencies [vcs: #minor]

docs/source/api.rst

@@ -17,6 +17,6 @@ Submodules
    io
    pyfeatures.multitrace
    pyfeatures.pyfeatures
+   pyfeatures.validation
    units
    settings
-   validation

efel/pyfeatures/pyfeatures.py

@@ -45,6 +45,8 @@
     'depol_block_bool',
     'Spikecount',
     'Spikecount_stimint',
+    'spike_count',
+    'spike_count_stimint',
     'spikes_per_burst',
     'spikes_per_burst_diff',
     'spikes_in_burst1_burst2_diff',

tests/test_allfeatures.py

@@ -126,7 +126,10 @@ def test_allfeatures():
     """allfeatures: Regression testing all features on a trace"""
 
     feature_values = get_allfeature_values()
-
+    # drop spike_count and spike_count_stimint from feature values since they
+    # are the same as deprecated Spikecount and Spikecount_stimint
+    feature_values.pop('spike_count')
+    feature_values.pop('spike_count_stimint')
     test_data_path = os.path.join(testdata_dir, 'expectedresults.json')
     with open(test_data_path, 'r') as expected_json:
         expected_results = json.load(expected_json)
@@ -182,8 +185,9 @@ def test_allfeatures_on_constant_voltage():
         "steady_state_voltage", "steady_state_voltage_stimend",
         "voltage_deflection", "voltage_deflection_begin", "voltage_deflection_vb_ssse",
         "depol_block", "depol_block_bool", "voltage_base", "Spikecount",
-        "Spikecount_stimint", "burst_number", "strict_burst_number", "trace_check",
-        "ohmic_input_resistance", "ohmic_input_resistance_vb_ssse"
+        "Spikecount_stimint", "spike_count", "spike_count_stimint", "burst_number",
+        "strict_burst_number", "trace_check", "ohmic_input_resistance",
+        "ohmic_input_resistance_vb_ssse"
     ]
 
     for field in array_fields:

tests/test_basic.py

@@ -1711,6 +1711,8 @@ def test_getFeatureNames():
     test_data_path = testdata_dir.parent / 'featurenames.json'
     with open(test_data_path, 'r') as featurenames_json:
         expected_featurenames = json.load(featurenames_json)
+    # add the new names for the deprecated ones
+    expected_featurenames += ["spike_count", "spike_count_stimint"]
     assert set(efel.getFeatureNames()) == set(expected_featurenames)
 
 

tests/test_cppcore.py

@@ -97,6 +97,8 @@ def test_getFeatureNames(self):  # pylint: disable=R0201
         test_data_path = os.path.join(testdata_dir, '../featurenames.json')
         with open(test_data_path, 'r') as featurenames_json:
             expected_featurenames = json.load(featurenames_json)
+        # add the new names for the deprecated ones
+        expected_featurenames += ["spike_count", "spike_count_stimint"]
         assert set(feature_names) == set(expected_featurenames)
 
     def test_getFeatureDouble_failure(self):  # pylint: disable=R0201

tests/test_validation.py

@@ -6,7 +6,7 @@
 
 import efel
 from efel.io import load_ascii_input
-from efel.validation import check_ais_initiation
+from efel.pyfeatures.validation import check_ais_initiation
 
 
 testdata_dir = Path(__file__).parent / "testdata"