Merge pull request #443 from qutech/issues/442_time_type

Add an explicit creation of the time type from nominator and denominator

Closes #442

qupulse/utils/types.py

@@ -21,6 +21,10 @@
     def time_from_float(time: float, absolute_error: float=1e-12) -> TimeType:
         # gmpy2 is at least an order of magnitude faster than fractions.Fraction
         return gmpy2.mpq(gmpy2.f2q(time, absolute_error))
+
+    def time_from_fraction(numerator: int, denominator: int = 1) -> TimeType:
+        return gmpy2.mpq(numerator, denominator)
+
 except ImportError:
     warnings.warn('gmpy2 not found. Using fractions.Fraction as fallback. Install gmpy2 for better performance.')
 
@@ -29,6 +33,9 @@ def time_from_float(time: float, absolute_error: float=1e-12) -> TimeType:
     def time_from_float(time: float, absolute_error: float = 1e-12) -> TimeType:
         return fractions.Fraction(time).limit_denominator(int(1/absolute_error))
 
+    def time_from_fraction(numerator: int, denominator: int = 1) -> TimeType:
+        return fractions.Fraction(numerator=numerator, denominator=denominator)
+
 
 class DocStringABCMeta(abc.ABCMeta):
     """Metaclass that copies/refers to docstrings of the super class."""

tests/utils/time_type_tests.py

@@ -72,3 +72,18 @@ def test_fraction_time_from_float(self):
         self.assertEqual(self.fallback_qutypes.time_from_float(1000000 / 1000001, 1e-5),
                          fractions.Fraction(1))
 
+    @unittest.skipIf(gmpy2 is None, "gmpy2 not available.")
+    def test_default_time_from_fraction(self):
+        # assert mocking did no permanent damage
+        self.assertIs(gmpy2.mpq, qutypes.TimeType)
+
+        t = qutypes.time_from_fraction(43, 12)
+        # your challenge: find a better way
+        mpq_type = type(gmpy2.mpq())
+        self.assertIsInstance(t, mpq_type)
+        self.assertEqual(t, gmpy2.mpq(43, 12))
+
+    def test_fraction_time_from_fraction(self):
+        t = qutypes.time_from_fraction(43, 12)
+        self.assertIsInstance(t, fractions.Fraction)
+        self.assertEqual(t, fractions.Fraction(43, 12))