Skip to content

Commit 82f3503

Browse files
committed
test_iterator
1 parent c937a6c commit 82f3503

1 file changed

Lines changed: 39 additions & 28 deletions

File tree

test/test_iterator.py

Lines changed: 39 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -1,80 +1,91 @@
1-
""" Test renewal data structure
1+
"""Test renewal data structure
22
33
.. author:: Thomas Cokelaer, Thomas.Cokelaer@inria.fr
44
55
"""
6+
67
__revision__ = "$Id$"
78

9+
import pytest
10+
811
from openalea.sequence_analysis import _sequence_analysis as sa
9-
from openalea.sequence_analysis.hidden_variable_order_markov import *
10-
from openalea.sequence_analysis.hidden_semi_markov import *
11-
from openalea.sequence_analysis.renewal import *
12+
from openalea.sequence_analysis.hidden_variable_order_markov import (
13+
HiddenVariableOrderMarkov,
14+
)
15+
from openalea.sequence_analysis.hidden_semi_markov import HiddenSemiMarkov
16+
from openalea.sequence_analysis.renewal import Renewal
1217
from .tools import runTestClass, robust_path as get_shared_data
1318

1419
N = 10
15-
import os
20+
21+
22+
@pytest.fixture
23+
def create_data_hidden_semi_markov():
24+
return HiddenSemiMarkov(str(get_shared_data("test_hidden_semi_markov.dat")))
25+
26+
1627
# SEMI MARKOV case
17-
def test_semi_markov_iterator():
18-
hsm = HiddenSemiMarkov(str(get_shared_data('test_hidden_semi_markov.dat')))
28+
def test_semi_markov_iterator(create_data_hidden_semi_markov):
29+
hsm = create_data_hidden_semi_markov
1930
smi = sa._SemiMarkovIterator(hsm)
2031
sim = smi.simulation(N, True)
2132

33+
2234
def hsm_iterator(fn):
2335
hsm = HiddenSemiMarkov(fn)
2436
it = sa._SemiMarkovIterator(hsm)
2537
return it
2638

27-
def test_semi_markov_iterator2():
28-
fn = str(get_shared_data('test_hidden_semi_markov.dat'))
39+
40+
def test_semi_markov_iterator2(create_data_hidden_semi_markov):
41+
fn = create_data_hidden_semi_markov
2942
smi = hsm_iterator(fn)
3043
sim = smi.simulation(N, True)
3144

45+
3246
# VARIABLE ORDER MARKOV case
33-
def vom_iterator(fn):
3447

48+
49+
@pytest.fixture
50+
def create_data_variable_order_markov():
51+
return str(get_shared_data("dupreziana21.hc"))
52+
53+
54+
def vom_iterator(fn):
3555
vom = HiddenVariableOrderMarkov(fn)
3656
it = sa._VariableOrderMarkovIterator(vom)
3757
return it
3858

39-
def test_variable_order_markov_iterator():
40-
vom = HiddenVariableOrderMarkov(str(get_shared_data('dupreziana21.hc')))
59+
60+
def test_variable_order_markov_iterator(create_data_variable_order_markov):
61+
vom = HiddenVariableOrderMarkov(create_data_variable_order_markov)
4162
smi = sa._VariableOrderMarkovIterator(vom)
4263
sim = smi.simulation(N, True)
4364

44-
def test_variable_order_markov_iterator2():
45-
fn = str(get_shared_data('dupreziana21.hc'))
65+
66+
def test_variable_order_markov_iterator2(create_data_variable_order_markov):
67+
fn = create_data_variable_order_markov
4668
smi = vom_iterator(fn)
4769
sim = smi.simulation(N, True)
4870

71+
4972
# RENEWAL case
5073
def renewal_iterator(fn):
5174
ren = Renewal(fn)
5275
it = sa._RenewalIterator(ren)
5376
return it
5477

78+
5579
def _test_renewal_iterator2():
5680
"""to be fixed"""
5781
fn = path + "abri13.ren"
5882
smi = renewal_iterator(fn)
5983
sim = smi.simulation(N, True)
6084

85+
6186
def _test_renewal_iterator():
6287
"""to be fixed"""
6388
ren = Renewal(path + "abri13.ren")
6489
print((type(ren)))
6590
smi = sa._RenewalIterator(ren)
6691
sim = smi.simulation(N, True)
67-
68-
69-
70-
if __name__ == "__main__":
71-
72-
test_semi_markov_iterator()
73-
test_semi_markov_iterator2()
74-
75-
test_variable_order_markov_iterator()
76-
test_variable_order_markov_iterator2()
77-
78-
#test_renewal_iterator()
79-
#test_renewal_iterator2()
80-

0 commit comments

Comments
 (0)