From 3faa25a9bba1800420e4a10ff60336252c88d23f Mon Sep 17 00:00:00 2001
From: Moritz Huebner <email@moritz-huebner.de>
Date: Tue, 5 Jun 2018 11:58:18 +1000
Subject: [PATCH] Rewrote the imports
---
test/detector_tests.py | 3 +--
test/sampler_tests.py | 16 +++++++---------
2 files changed, 8 insertions(+), 11 deletions(-)
diff --git a/test/detector_tests.py b/test/detector_tests.py
index 346f59f41..9818b77d8 100644
--- a/test/detector_tests.py
+++ b/test/detector_tests.py
@@ -1,5 +1,4 @@
from context import tupak
-from tupak import detector
import unittest
import mock
from mock import MagicMock
@@ -23,7 +22,7 @@ class TestDetector(unittest.TestCase):
self.xarm_tilt = 0.
self.yarm_tilt = 0.
# noinspection PyTypeChecker
- self.ifo = detector.Interferometer(name=self.name, power_spectral_density=self.power_spectral_density,
+ self.ifo = tupak.detector.Interferometer(name=self.name, power_spectral_density=self.power_spectral_density,
minimum_frequency=self.minimum_frequency,
maximum_frequency=self.maximum_frequency, length=self.length,
latitude=self.latitude, longitude=self.longitude, elevation=self.elevation,
diff --git a/test/sampler_tests.py b/test/sampler_tests.py
index dad950963..0135aaaf5 100644
--- a/test/sampler_tests.py
+++ b/test/sampler_tests.py
@@ -1,6 +1,4 @@
from context import tupak
-from tupak import prior
-from tupak.result import Result
import unittest
from mock import MagicMock
import numpy as np
@@ -14,12 +12,12 @@ class TestSampler(unittest.TestCase):
def setUp(self):
likelihood = tupak.likelihood.Likelihood()
likelihood.parameters = dict(a=1, b=2, c=3)
- delta_prior = prior.DeltaFunction(peak=0)
- delta_prior.rescale = MagicMock(return_value=prior.DeltaFunction(peak=1))
+ delta_prior = tupak.prior.DeltaFunction(peak=0)
+ delta_prior.rescale = MagicMock(return_value=tupak.prior.DeltaFunction(peak=1))
delta_prior.prob = MagicMock(return_value=1)
delta_prior.sample = MagicMock(return_value=0)
- uniform_prior = prior.Uniform(0, 1)
- uniform_prior.rescale = MagicMock(return_value=prior.Uniform(0, 2))
+ uniform_prior = tupak.prior.Uniform(0, 1)
+ uniform_prior.rescale = MagicMock(return_value=tupak.prior.Uniform(0, 2))
uniform_prior.prob = MagicMock(return_value=1)
uniform_prior.sample = MagicMock(return_value=0.5)
@@ -78,7 +76,7 @@ class TestSampler(unittest.TestCase):
self.sampler.external_sampler = object()
def test_result(self):
- expected_result = Result()
+ expected_result = tupak.result.Result()
expected_result.search_parameter_keys = ['c']
expected_result.fixed_parameter_keys = ['a']
expected_result.parameter_labels = ['c']
@@ -92,7 +90,7 @@ class TestSampler(unittest.TestCase):
def test_prior_transform_transforms_search_parameter_keys(self):
self.sampler.prior_transform([0])
- expected_prior = prior.Uniform(0, 1)
+ expected_prior = tupak.prior.Uniform(0, 1)
self.assertListEqual([self.sampler.priors['c'].minimum,
self.sampler.priors['c'].maximum],
[expected_prior.minimum,
@@ -101,7 +99,7 @@ class TestSampler(unittest.TestCase):
def test_prior_transform_does_not_transform_fixed_parameter_keys(self):
self.sampler.prior_transform([0])
self.assertEqual(self.sampler.priors['a'].peak,
- prior.DeltaFunction(peak=0).peak)
+ tupak.prior.DeltaFunction(peak=0).peak)
def test_log_prior(self):
self.assertEqual(self.sampler.log_prior({1}), 0.0)
--
GitLab