Skip to content

Fix br #12

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 5 commits into
base: master
Choose a base branch
from
Open

Fix br #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
f396679
I edited the README.md
Apr 11, 2015
86d10d3
changed title
katieshakman Apr 11, 2015
8acfcc1
Yup.
katieshakman Apr 11, 2015
193ff80
update
katieshakman Apr 11, 2015
df3cc03
Fixed the test.
katieshakman Apr 11, 2015
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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)
Expand Down
3 changes: 2 additions & 1 deletion gitgoing/gitgoing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
14 changes: 6 additions & 8 deletions tests/test_gitgoing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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')])
Expand Down