From 2370856bf569b494c9becaedb602093c969056ca Mon Sep 17 00:00:00 2001
From: Matthew Pitkin <matthew.pitkin@ligo.org>
Date: Mon, 4 Mar 2019 09:36:02 +0000
Subject: [PATCH] flake8 fixes
---
bilby/core/prior.py | 8 +++----
test/prior_test.py | 57 +++++++++++++++++++++++++--------------------
2 files changed, 36 insertions(+), 29 deletions(-)
diff --git a/bilby/core/prior.py b/bilby/core/prior.py
index 1950e61a3..81675fa21 100644
--- a/bilby/core/prior.py
+++ b/bilby/core/prior.py
@@ -2103,8 +2103,8 @@ class MultivariateGaussian(object):
# rotate and scale to the multivariate normal shape
samp = self.mus[mode] + self.sigmas[mode] * np.einsum('ij,kj->ik',
- samp * self.sqeigvalues[mode],
- self.eigvectors[mode])
+ samp * self.sqeigvalues[mode],
+ self.eigvectors[mode])
return np.squeeze(samp)
@@ -2172,7 +2172,7 @@ class MultivariateGaussian(object):
if np.any(outbounds):
break
- lnprob = -np.inf*np.ones(samp.shape[0])
+ lnprob = -np.inf * np.ones(samp.shape[0])
for j in range(samp.shape[0]):
# loop over the modes and sum the probabilities
for i in range(self.nmodes):
@@ -2278,7 +2278,7 @@ class MultivariateGaussianPrior(Prior):
if len(self.mvg.current_sample) == 0:
# generate a sample
self.mvg.sample(size=size, mode=mode)
-
+
sample = self.mvg.current_sample[self.name]
if self.name not in self.mvg.sampled_parameters:
diff --git a/test/prior_test.py b/test/prior_test.py
index cd700ff91..04f008e38 100644
--- a/test/prior_test.py
+++ b/test/prior_test.py
@@ -51,7 +51,7 @@ class TestPriorInstantiationWithoutOptionalPriors(unittest.TestCase):
self.prior.maximum = 1
val_below = self.prior.minimum - 0.1
val_at_minimum = self.prior.minimum
- val_in_prior = (self.prior.minimum + self.prior.maximum)/2.
+ val_in_prior = (self.prior.minimum + self.prior.maximum) / 2.
val_at_maximum = self.prior.maximum
val_above = self.prior.maximum + 0.1
self.assertTrue(self.prior.is_in_prior_range(val_at_minimum))
@@ -411,30 +411,37 @@ class TestPriorDict(unittest.TestCase):
self.assertDictEqual(self.priors, dict(self.prior_set_from_dict))
def test_read_from_file(self):
- expected = dict(
- mass_1=bilby.core.prior.Uniform(
- name='mass_1', minimum=5, maximum=100, unit='$M_{\\odot}$'),
- mass_2=bilby.core.prior.Uniform(
- name='mass_2', minimum=5, maximum=100, unit='$M_{\\odot}$'),
- a_1=bilby.core.prior.Uniform(name='a_1', minimum=0, maximum=0.8),
- a_2=bilby.core.prior.Uniform(name='a_2', minimum=0, maximum=0.8),
- tilt_1=bilby.core.prior.Sine(name='tilt_1'),
- tilt_2=bilby.core.prior.Sine(name='tilt_2'),
- phi_12=bilby.core.prior.Uniform(
- name='phi_12', minimum=0, maximum=2 * np.pi),
- phi_jl=bilby.core.prior.Uniform(
- name='phi_jl', minimum=0, maximum=2 * np.pi),
- luminosity_distance=bilby.gw.prior.UniformComovingVolume(
- name='luminosity_distance', minimum=1e2,
- maximum=5e3, unit='Mpc'),
- dec=bilby.core.prior.Cosine(name='dec'),
- ra=bilby.core.prior.Uniform(
- name='ra', minimum=0, maximum=2 * np.pi),
- theta_jn=bilby.core.prior.Sine(name='theta_jn'),
- psi=bilby.core.prior.Uniform(name='psi', minimum=0, maximum=np.pi),
- phase=bilby.core.prior.Uniform(
- name='phase', minimum=0, maximum=2 * np.pi)
- )
+ expected = dict(mass_1=bilby.core.prior.Uniform(name='mass_1',
+ minimum=5,
+ maximum=100,
+ unit='$M_{\\odot}$'),
+ mass_2=bilby.core.prior.Uniform(name='mass_2',
+ minimum=5,
+ maximum=100,
+ unit='$M_{\\odot}$'),
+ a_1=bilby.core.prior.Uniform(name='a_1', minimum=0,
+ maximum=0.8),
+ a_2=bilby.core.prior.Uniform(name='a_2', minimum=0,
+ maximum=0.8),
+ tilt_1=bilby.core.prior.Sine(name='tilt_1'),
+ tilt_2=bilby.core.prior.Sine(name='tilt_2'),
+ phi_12=bilby.core.prior.Uniform(name='phi_12',
+ minimum=0,
+ maximum=2 * np.pi),
+ phi_jl=bilby.core.prior.Uniform(name='phi_jl',
+ minimum=0,
+ maximum=2 * np.pi),
+ luminosity_distance=bilby.gw.prior.UniformComovingVolume(name='luminosity_distance',
+ minimum=1e2,
+ maximum=5e3, unit='Mpc'),
+ dec=bilby.core.prior.Cosine(name='dec'),
+ ra=bilby.core.prior.Uniform(name='ra', minimum=0,
+ maximum=2 * np.pi),
+ theta_jn=bilby.core.prior.Sine(name='theta_jn'),
+ psi=bilby.core.prior.Uniform(name='psi', minimum=0,
+ maximum=np.pi),
+ phase=bilby.core.prior.Uniform(name='phase', minimum=0,
+ maximum=2 * np.pi))
self.assertDictEqual(expected, self.prior_set_from_file)
def test_to_file(self):
--
GitLab