Merge branch 'master' into feature-product-domain

Author: ihincks

src/qinfer/tests/base_test.py

@@ -573,11 +573,11 @@ def test_in_domain(self):
             try:
                 assert(self.domain.in_domain(v))
             except AssertionError as e:
-                print('Current Value: {}'.format(v))
+                e.args += ('Current good value: {}'.format(v),)
                 raise e
         for v in self.bad_values:
             try:
                 assert(not self.domain.in_domain(v))
             except AssertionError as e:
-                print('Current Value: {}'.format(v))
+                e.args += ('Current bad value: {}'.format(v),)
                 raise e

src/qinfer/tests/test_smc.py

@@ -64,7 +64,7 @@ def likelihood(self, outcomes, modelparams, expparams):
         assert expparams.shape == (1,) # Only defined for single experiments.
 
         pr0 = np.ones((modelparams.shape[0], expparams.shape[0])) / 2
-        idx_dec_at = np.ceil(expparams['alpha'][0] * modelparams.shape[0])
+        idx_dec_at = np.ceil(expparams['alpha'][0] * modelparams.shape[0]).astype(np.int)
         pr0[idx_dec_at:, :] = 0 
 
         return FiniteOutcomeModel.pr0_to_likelihood_array(outcomes, pr0)