diff --git a/README.md b/README.md index 4ac7af6..2033da2 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,5 @@ -# gitgoing +# gitgoing Katie +# This is from Katie's clone of a gitgoing fork. Yup. [![Build Status](https://travis-ci.org/CodeNeuro/gitgoing.png?branch=master)](https://travis-ci.org/CodeNeuro/gitgoing) [![Join the chat at https://gitter.im/CodeNeuro/gitgoing](https://badges.gitter.im/Join%20Chat.svg)](https://gitter.im/CodeNeuro/gitgoing?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge&utm_content=badge) diff --git a/gitgoing/gitgoing.py b/gitgoing/gitgoing.py index 375b900..597f43a 100755 --- a/gitgoing/gitgoing.py +++ b/gitgoing/gitgoing.py @@ -57,7 +57,8 @@ def cv(x): cv : float The coefficient of variation of the entire array """ - return mean_plus_one(x)/std_plus_one(x) + #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 diff --git a/tests/test_gitgoing.py b/tests/test_gitgoing.py index 5d4b76c..6042388 100755 --- a/tests/test_gitgoing.py +++ b/tests/test_gitgoing.py @@ -37,14 +37,12 @@ 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 # This test will fail @pytest.fixture(params=['soma', 'axon', 'synapse', 'dendrite', pytest.mark.xfail('fibroblast')])