From bcce10476afe055adff09c77697d5349163a823d Mon Sep 17 00:00:00 2001 From: Matt Graham Date: Wed, 23 Oct 2019 18:04:50 +0800 Subject: [PATCH] Updating tests to use new package name and state interface --- tests/test_integrators.py | 16 ++++++++-------- tests/test_matrices.py | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/tests/test_integrators.py b/tests/test_integrators.py index f79158b..1ce0e0b 100644 --- a/tests/test_integrators.py +++ b/tests/test_integrators.py @@ -1,8 +1,8 @@ import numpy as np -import hmc.integrators as integrators -import hmc.systems as systems -import hmc.states as states -from hmc.errors import IntegratorError +import mici.integrators as integrators +import mici.systems as systems +import mici.states as states +from mici.errors import IntegratorError SEED = 3046987125 SIZES = {1, 2, 5, 10} @@ -118,7 +118,7 @@ def __init__(self): lambda q: 0.5 * np.sum(q**2), grad_neg_log_dens=lambda q: q) self.integrator = integrators.LeapfrogIntegrator(system, 0.5) self.states = {size: [ - states.HamiltonianState(pos=q, mom=p) + states.ChainState(pos=q, mom=p, dir=1) for q, p in self.rng.standard_normal((N_STATE, 2, size))] for size in SIZES} self.h_diff_tol = 5e-3 @@ -133,7 +133,7 @@ def __init__(self): lambda q: 0.25 * np.sum(q**4), grad_neg_log_dens=lambda q: q**3) self.integrator = integrators.LeapfrogIntegrator(system, 0.1) self.states = {size: [ - states.HamiltonianState(pos=q, mom=p) + states.ChainState(pos=q, mom=p, dir=1) for q, p in self.rng.standard_normal((N_STATE, 2, size))] for size in SIZES} self.h_diff_tol = 2e-2 @@ -148,7 +148,7 @@ def __init__(self): lambda q: 0, grad_neg_log_dens=lambda q: 0 * q) self.integrator = integrators.LeapfrogIntegrator(system, 0.5) self.states = {size: [ - states.HamiltonianState(pos=q, mom=p) + states.ChainState(pos=q, mom=p, dir=1) for q, p in self.rng.standard_normal((N_STATE, 2, size))] for size in SIZES} self.h_diff_tol = 1e-10 @@ -164,7 +164,7 @@ def __init__(self): grad_neg_log_dens=lambda q: 0.5 * q**3) self.integrator = integrators.LeapfrogIntegrator(system, 0.1) self.states = {size: [ - states.HamiltonianState(pos=q, mom=p) + states.ChainState(pos=q, mom=p, dir=1) for q, p in self.rng.standard_normal((N_STATE, 2, size))] for size in SIZES} self.h_diff_tol = 1e-2 diff --git a/tests/test_matrices.py b/tests/test_matrices.py index 4aca28e..1c92010 100644 --- a/tests/test_matrices.py +++ b/tests/test_matrices.py @@ -1,4 +1,4 @@ -import hmc.matrices as matrices +import mici.matrices as matrices import numpy as np import numpy.linalg as nla import scipy.linalg as sla