Merge 6b8f1ae into ecc567a

tBuLi · Mar 19, 2020 · 01b727a · 01b727a
2 parents ecc567a + 6b8f1ae
commit 01b727a
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 3 deletions.
diff --git a/symfit/core/printing.py b/symfit/core/printing.py
@@ -6,7 +6,7 @@
 
 Users using both ``symfit`` and ``sympy`` should be aware of this.
 """
-
+import pkg_resources
 from sympy import HadamardProduct, MatPow, Idx, Inverse
 from sympy.printing.codeprinter import CodePrinter
 
@@ -41,6 +41,15 @@ def _print_HadamardProduct(self, printer):
                       printer.doprint(self.args[1]))
 HadamardProduct._numpycode = _print_HadamardProduct
 
+if pkg_resources.parse_version(pkg_resources.get_distribution('sympy').version) \
+        > pkg_resources.parse_version('1.4'):
+    from sympy import HadamardPower
+
+    def _print_HadamardPower(self, printer):
+        return "%s**%s" % (printer.doprint(self.args[0]),
+                          printer.doprint(self.args[1]))
+    HadamardPower._numpycode = _print_HadamardPower
+
 def _print_Idx(self, printer):
     """
     Print ``Idx`` objects.

diff --git a/tests/test_ode.py b/tests/test_ode.py
@@ -246,8 +246,8 @@ def test_initial_parameters():
     fit = Fit(ode_model, t=tdata, a=AA, c=AAB, d=BAAB)
     results = fit.execute()
     print(results)
-    assert results.value(a0) == 10
-    assert results.value(c0) == pytest.approx(0)
+    assert results.value(a0) == pytest.approx(10, abs=1e-8)
+    assert results.value(c0) == pytest.approx(0, abs=1e-8)
 
     assert ode_model.params == [a0, c0, k, l, m, p]
     assert ode_model.initial_params == [a0, c0]