From dd220fb0ed2eba25ce3cf7e34d464c8110d36f45 Mon Sep 17 00:00:00 2001 From: Andrew Zaharia Date: Sat, 11 Apr 2015 12:00:44 -0400 Subject: [PATCH 1/4] andrew wuz here --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 4ac7af6..f3b0113 100644 --- a/README.md +++ b/README.md @@ -1,3 +1,5 @@ +# andrew wuz here + # gitgoing [![Build Status](https://travis-ci.org/CodeNeuro/gitgoing.png?branch=master)](https://travis-ci.org/CodeNeuro/gitgoing) From a16b3a7ad261cbc042bfc8f2153eed649fcdc291 Mon Sep 17 00:00:00 2001 From: Andrew Zaharia Date: Sat, 11 Apr 2015 13:15:33 -0400 Subject: [PATCH 2/4] Fixed cv function!! Yaay!! --- tests/test_gitgoing.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_gitgoing.py b/tests/test_gitgoing.py index 0fa61d3..d9b9761 100755 --- a/tests/test_gitgoing.py +++ b/tests/test_gitgoing.py @@ -38,10 +38,10 @@ def test_std_plus_one(x_norm): assert test_std == true_std def test_cv_broken(x_norm): - from gitgoing.gitgoing import std_plus_one, mean_plus_one, cv + from 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) + true_cv = mean_plus_one(x_norm)/std_plus_one(x_norm) # This test will fail assert test_cv == true_cv From 22d56bfe059f9a9de131789746067da7ae65fda7 Mon Sep 17 00:00:00 2001 From: Andrew Zaharia Date: Sat, 11 Apr 2015 13:33:15 -0400 Subject: [PATCH 3/4] uncommented --- tests/test_gitgoing.py | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/tests/test_gitgoing.py b/tests/test_gitgoing.py index 1a34cdc..08fe2b5 100755 --- a/tests/test_gitgoing.py +++ b/tests/test_gitgoing.py @@ -37,14 +37,14 @@ 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 +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) + 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 + # This test will fail + assert test_cv == true_cv @pytest.fixture(params=['soma', 'axon', 'synapse', 'dendrite', pytest.mark.xfail('fibroblast')]) From b713f56bca7c43f14119134b49be1818f8f1e0b6 Mon Sep 17 00:00:00 2001 From: Andrew Zaharia Date: Sat, 11 Apr 2015 13:33:39 -0400 Subject: [PATCH 4/4] fixed cv --- tests/test_gitgoing.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/test_gitgoing.py b/tests/test_gitgoing.py index 08fe2b5..9bba21c 100755 --- a/tests/test_gitgoing.py +++ b/tests/test_gitgoing.py @@ -38,10 +38,10 @@ def test_std_plus_one(x_norm): assert test_std == true_std def test_cv_broken(x_norm): - from gitgoing.gitgoing import std_plus_one, mean_plus_one, cv + from 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) + true_cv = mean_plus_one(x_norm)/std_plus_one(x_norm) # This test will fail assert test_cv == true_cv