From 567b0986408f1e1dd59f9f36e611b7ddd5275c13 Mon Sep 17 00:00:00 2001
From: Soichiro Morisaki <soichiro.morisaki@ligo.org>
Date: Fri, 30 Oct 2020 11:32:44 -0500
Subject: [PATCH] bilby/gw/prior.py: Fix the equality check of
UniformInComponentsMassRatio
---
bilby/gw/prior.py | 20 ++++++++++++++++++--
1 file changed, 18 insertions(+), 2 deletions(-)
diff --git a/bilby/gw/prior.py b/bilby/gw/prior.py
index 3de39b44..3ffcfb19 100644
--- a/bilby/gw/prior.py
+++ b/bilby/gw/prior.py
@@ -313,6 +313,21 @@ class UniformInComponentsChirpMass(PowerLaw):
name=name, latex_label=latex_label, unit=unit, boundary=boundary)
+class WrappedInterp1d(interp1d):
+ """ A wrapper around scipy interp1d which sets equality-by-instantiation """
+ def __eq__(self, other):
+
+ for key in self.__dict__:
+ if type(self.__dict__[key]) is np.ndarray:
+ if not np.array_equal(self.__dict__[key], other.__dict__[key]):
+ return False
+ elif key == "_spline":
+ pass
+ elif getattr(self, key) != getattr(other, key):
+ return False
+ return True
+
+
class UniformInComponentsMassRatio(Prior):
def __init__(self, minimum, maximum, name='mass_ratio', latex_label='$q$',
@@ -339,8 +354,9 @@ class UniformInComponentsMassRatio(Prior):
latex_label=latex_label, unit=unit, boundary=boundary)
self.norm = self._integral(maximum) - self._integral(minimum)
qs = np.linspace(minimum, maximum, 1000)
- self.icdf = interp1d(self.cdf(qs), qs, kind='cubic',
- bounds_error=False, fill_value=(minimum, maximum))
+ self.icdf = WrappedInterp1d(
+ self.cdf(qs), qs, kind='cubic',
+ bounds_error=False, fill_value=(minimum, maximum))
@staticmethod
def _integral(q):
--
GitLab