fixed up tests

Author: jsalvatier

tests/models.py

@@ -6,7 +6,7 @@ def simple_init():
     start, model, moments = simple_model()
 
     step = Metropolis(model, model.vars, np.diag([1.]))
-    return start, step, moments
+    return model, start, step, moments
 
 
 def simple_model():
@@ -22,8 +22,8 @@ def simple_2model():
     tau = 1.3
     p = .4
     with Model() as model:
-        x = Normal('x', mu,tau, testval = .1)
-        y = Bernoulli('y', p)
+        x = pm.Normal('x', mu,tau, testval = .1)
+        y = pm.Bernoulli('y', p)
 
     return model.test_point, model
 

tests/test_sampling.py

@@ -10,15 +10,15 @@
     test_parallel = False
 
 def test_sample():
-    start, step,_ = simple_init()
+    model, start, step,_ = simple_init()
 
     test_samplers = [sample]
     if test_parallel:
         test_samplers.append(psample)
 
     for     samplr  in test_samplers: 
         for n       in [0, 10, 1000]:
-            yield samplr, n, step, start
+            yield samplr, model, n, step, start
 
 
 

tests/test_step.py

@@ -26,7 +26,7 @@ def test_step_continuous():
     for st in steps:
         for (var, stat, val, bound) in check:
             np.random.seed(1)
-            h, _, _ = sample(8000, st, start)
+            h = sample(model, 8000, st, start)
 
             yield check_stat,repr(st), h, var, stat, val, bound  
 

tests/test_trace.py

@@ -10,44 +10,44 @@
 except:
     test_parallel = False
 
-def check_trace(trace, n, step, start):
-
+def check_trace(model, trace, n, step, start):
     #try using a trace object a few times
     for i in range(2):
-        trace, _, _ = sample(n, step, start, trace)
+        trace = sample(model, n, step, start, trace)
 
         for (var, val) in start.iteritems():
 
             assert np.shape(trace[var]) == (n*(i+1),) + np.shape(val)
 
 
 def test_trace():
-    start, step,_  = simple_init()
+    model, start, step,_  = simple_init()
 
     for     h in [pm.NpTrace]:
         for n in [20, 1000]:
-            trace = h()
+            trace = h(model.vars)
 
-            yield check_trace, trace, n, step, start
+            yield check_trace, model, trace, n, step, start
 
 def test_multitrace():
     if not test_parallel:
         return
-    start, step,_  = simple_init()
+    model, start, step,_  = simple_init()
     trace = None
     for n in [20, 1000]:
 
-        yield check_multi_trace, trace, n, step, start
+        yield check_multi_trace, model, trace, n, step, start
 
 
 
-def check_multi_trace(trace, n, step, start):
+def check_multi_trace(model, trace, n, step, start):
 
-    #try using a trace object a few times
     for i in range(2):
-        trace, _, _ = psample(n, step, start, trace)
+        trace = psample(model, n, step, start, trace)
+        
 
         for (var, val) in start.iteritems():
+            print [len(tr.samples[var].vals) for tr in trace.traces]
             for t in trace[var]:
                 assert np.shape(t) == (n*(i+1),) + np.shape(val)