Skip to content

Commit

Permalink
Correct small errors
Browse files Browse the repository at this point in the history
Change-Id: I7fd5a6db6da17c6914b3481ca34a5ff9f07e5f1e
  • Loading branch information
lidakanari authored and Benoît Coste committed Aug 21, 2019
1 parent 5e0cd38 commit b84b964
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
3 changes: 2 additions & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@
author_email='lida.kanari@epfl.ch',
install_requires=[
'matplotlib>=1.3.1',
'morphio>=2.0.0',
'morphio>=2.2.0',
'morph-tool>=0.1.12',
'neurom>=1.4.7',
'tmd>=2.0.4',
'enum34>=1.0.4',
Expand Down
8 changes: 3 additions & 5 deletions tests/test_neuron_functional.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,8 +13,8 @@
import numpy as np
from scipy.spatial.distance import cdist
from numpy.testing import assert_almost_equal, assert_array_almost_equal
from nose.tools import assert_raises, assert_equal, ok_
from morphio import Morphology
from nose.tools import assert_raises, ok_
from morph_tool import diff
from tns.generate.grower import NeuronGrower
from .utils import setup_tempdir
import tmd
Expand Down Expand Up @@ -65,9 +65,7 @@ def _test_full(feature, distributions, parameters, ref_cell, ref_persistence_dia
assert_close_persistent_diagram(actual_persistence_diagram,
expected_persistence_diagram)

assert_equal(Morphology(out_neuron),
Morphology(os.path.join(_path, ref_cell)))

ok_(not diff(out_neuron, os.path.join(_path, ref_cell)))


def test_wrong_filtration():
Expand Down
5 changes: 3 additions & 2 deletions tns/generate/grower.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
'''
TNS class : Grower object that contains the grower functionality.
'''
import copy
from morphio.mut import Morphology # pylint: disable=import-error
from tns.generate.soma import SomaGrower
from tns.morphmath import sample
Expand All @@ -26,8 +27,8 @@ def __init__(self, input_parameters, input_distributions, context=None):
self.neuron = Morphology()
self.context = context

self.input_parameters = input_parameters
self.input_distributions = input_distributions
self.input_parameters = copy.deepcopy(input_parameters)
self.input_distributions = copy.deepcopy(input_distributions)

# Consistency check between parameters and distributions
for tree_type in self.input_parameters['grow_types']:
Expand Down

0 comments on commit b84b964

Please sign in to comment.