diff --git a/gitgoing/gitgoing.py b/gitgoing/gitgoing.py index 375b900..7e8b6a8 100755 --- a/gitgoing/gitgoing.py +++ b/gitgoing/gitgoing.py @@ -57,7 +57,7 @@ def cv(x): cv : float The coefficient of variation of the entire array """ - return mean_plus_one(x)/std_plus_one(x) + return std_plus_one(x)/mean_plus_one(x) def is_neuron_component(component): - return component in NEURON_COMPONENTS \ No newline at end of file + return component in NEURON_COMPONENTS diff --git a/tests/test_gitgoing.py b/tests/test_gitgoing.py index 5d4b76c..0362998 100755 --- a/tests/test_gitgoing.py +++ b/tests/test_gitgoing.py @@ -37,14 +37,13 @@ def test_std_plus_one(x_norm): true_std = np.std(x_norm) + 1 assert test_std == true_std -# def test_cv_broken(x_norm): -# from gitgoing.gitgoing import std_plus_one, mean_plus_one, cv -# -# test_cv = cv(x_norm) -# true_cv = std_plus_one(x_norm)/mean_plus_one(x_norm) -# -# # This test will fail -# assert test_cv == true_cv +def test_cv_broken(x_norm): + from gitgoing.gitgoing import std_plus_one, mean_plus_one, cv + + test_cv = cv(x_norm) + true_cv = std_plus_one(x_norm)/mean_plus_one(x_norm) + + assert test_cv == true_cv @pytest.fixture(params=['soma', 'axon', 'synapse', 'dendrite', pytest.mark.xfail('fibroblast')]) @@ -56,4 +55,4 @@ def test_is_neuron_component(neuron_component): test_neuron_component = is_neuron_component(neuron_component) true_neuron_component = neuron_component in NEURON_COMPONENTS - assert test_neuron_component == true_neuron_component \ No newline at end of file + assert test_neuron_component == true_neuron_component