Merge branch 'master' into merge-master-into-features

2016-11-27 17:30:40 -02:00
parent 5ce551e469 0735d4549d
commit b30a6d22c5
18 changed files with 163 additions and 42 deletions
--- a/testing/python/approx.py
+++ b/testing/python/approx.py
@@ -28,6 +28,7 @@ class TestApprox:
        print(approx(inf))
        print(approx(1.0, rel=nan))
        print(approx(1.0, rel=inf))
+        print(approx(1.0j, rel=inf))

    def test_operator_overloading(self):
        assert 1 == approx(1, rel=1e-6, abs=1e-12)