From 22aadab726b66785cdf1032ddd655a63b84c6fe3 Mon Sep 17 00:00:00 2001
From: moritz <email@moritz-huebner.de>
Date: Tue, 15 May 2018 16:13:58 +1000
Subject: [PATCH] Moritz Huebner: Removed unused prior functions
---
test/prior_tests.py | 21 ---------------------
tupak/prior.py | 28 ----------------------------
2 files changed, 49 deletions(-)
diff --git a/test/prior_tests.py b/test/prior_tests.py
index 566dc3f28..bc8b64ebd 100644
--- a/test/prior_tests.py
+++ b/test/prior_tests.py
@@ -62,27 +62,6 @@ class TestPriorLatexLabel(unittest.TestCase):
self.assertTrue(self.prior.latex_label, self.prior.name)
-class TestPriorIsFixed(unittest.TestCase):
-
- def setUp(self):
- pass
-
- def tearDown(self):
- pass
-
- def test_is_fixed_parent_class(self):
- self.prior = tupak.prior.Prior()
- self.assertFalse(self.prior.is_fixed)
-
- def test_is_fixed_delta_function_class(self):
- self.prior = tupak.prior.DeltaFunction(peak=0)
- self.assertTrue(self.prior.is_fixed)
-
- def test_is_fixed_uniform_class(self):
- self.prior = tupak.prior.Uniform(minimum=0, maximum=10)
- self.assertFalse(self.prior.is_fixed)
-
-
class TestFixMethod(unittest.TestCase):
def setUp(self):
diff --git a/tupak/prior.py b/tupak/prior.py
index bdcc435c4..d47b237c4 100644
--- a/tupak/prior.py
+++ b/tupak/prior.py
@@ -359,13 +359,6 @@ class UniformComovingVolume(FromFile):
latex_label=latex_label)
-def fix(prior, value=None):
- if value is None or np.isnan(value):
- raise ValueError("You can't fix the value to be np.nan. You need to assign it a legal value")
- prior = DeltaFunction(name=prior.name, latex_label=prior.latex_label, peak=value)
- return prior
-
-
def create_default_prior(name):
"""
Make a default prior for a parameter with a known name.
@@ -409,27 +402,6 @@ def create_default_prior(name):
return prior
-def parse_floats_to_fixed_priors(old_parameters):
- parameters = old_parameters.copy()
- for key in parameters:
- if type(parameters[key]) is not float and type(parameters[key]) is not int \
- and type(parameters[key]) is not Prior:
- logging.info("Expected parameter " + str(key) + " to be a float or int but was "
- + str(type(parameters[key])) + " instead. Will not be converted.")
- continue
- elif type(parameters[key]) is Prior:
- continue
- parameters[key] = DeltaFunction(name=key, latex_label=None, peak=old_parameters[key])
- return parameters
-
-
-def parse_keys_to_parameters(keys):
- parameters = {}
- for key in keys:
- parameters[key] = create_default_prior(key)
- return parameters
-
-
def fill_priors(prior, waveform_generator):
"""
Fill dictionary of priors based on required parameters of waveform generator
--
GitLab