snappy 3.1.1__cp39-cp39-macosx_11_0_arm64.whl → 3.2__cp39-cp39-macosx_11_0_arm64.whl

snappy/verify/{squareExtensions.py → square_extensions.py}

@@ -1,5 +1,5 @@
 """
-The squareExtensions module provides
+The square_extensions module provides
 two special classes to give exact representations of the values
 involved when computing a cusp cross section.
 
@@ -39,7 +39,7 @@ if _within_sage:
 
     from ..snap import find_field
 
-from .realAlgebra import field_containing_real_and_imaginary_part_of_number_field
+from .real_algebra import field_containing_real_and_imaginary_part_of_number_field
 
 
 def eval_number_field_elt(elt, root):
@@ -75,7 +75,7 @@ def eval_number_field_elt(elt, root):
 #    _field_containing_real_and_imaginary_part_of_algebraic_number_LLL.
 # This was still very slow and failed on t11669 and 9 manifolds with 9 tetrahedra.
 #
-# The fastest implementation so far is in realAlgebra. The implementation there
+# The fastest implementation so far is in real_algebra. The implementation there
 # turns the one complex equation p(z) = 0 defining the number field into two
 # real equations for the real and imaginary part of the complex equation and
 # then uses the resultant to find exact solutions.
@@ -272,6 +272,9 @@ class SqrtLinCombination():
         # Set embed cache, see _get_interval_embedding_from_cache for details
         self._embed_cache = embed_cache
 
+    def parent(self):
+        return SqrtLinCombination
+        
     def __add__(self, other):
         # Try to convert other term to SqrtLinCombination if necessary
         if not isinstance(other, SqrtLinCombination):
@@ -291,7 +294,7 @@ class SqrtLinCombination():
     def __neg__(self):
         # Negate
         return SqrtLinCombination(
-            d=dict( (k, -v) for k, v in self._dict.items() ),
+            d={ k: -v for k, v in self._dict.items() },
             embed_cache=self._embed_cache)
 
     def __sub__(self, other):
@@ -701,8 +704,8 @@ class _FactorizedSqrtLinCombination():
             else:
                 return frozenset([k])
 
-        return _FactorizedSqrtLinCombination(dict(
-            (to_set(k), v) for k, v in l._dict.items()),
+        return _FactorizedSqrtLinCombination({
+            to_set(k): v for k, v in l._dict.items()},
             embed_cache=l._embed_cache)
 
     def __add__(self, other):
@@ -718,7 +721,7 @@ class _FactorizedSqrtLinCombination():
 
     def __neg__(self):
         return _FactorizedSqrtLinCombination(
-            dict((k, -v) for k, v in self._dict.items()),
+            {k: -v for k, v in self._dict.items()},
             embed_cache=self._embed_cache)
 
     def __sub__(self, other):
@@ -767,17 +770,17 @@ class _FactorizedSqrtLinCombination():
             operator.and_, self._dict.keys())
 
         # Factor them out
-        d = dict((k - common_terms, v) for k, v in self._dict.items())
+        d = {k - common_terms: v for k, v in self._dict.items()}
 
         # Pick one r_{i,j}
         term = _firstfirst(d.keys())
 
         # Split the summands into "left" and "right"
         left = _FactorizedSqrtLinCombination(
-            dict( (k, v) for k, v in d.items() if term in k ),
+            { k: v for k, v in d.items() if term in k },
             embed_cache=self._embed_cache)
         right = _FactorizedSqrtLinCombination(
-            dict( (k, v) for k, v in d.items() if term not in k),
+            { k: v for k, v in d.items() if term not in k},
             embed_cache=self._embed_cache)
 
         # Check left^2 - right^2 == 0
@@ -864,7 +867,7 @@ def _filter_zero(d):
     """
     Given a dict, filter out all items where the value is 0.
     """
-    return dict((k, v) for k, v in d.items() if v != 0)
+    return {k: v for k, v in d.items() if v != 0}
 
 
 def _convert_to_allowed_type(number):

snappy/verify/test.py

@@ -1,35 +1,19 @@
-from snappy import verify, Manifold
-from snappy.verify import upper_halfspace, cusp_shapes, cusp_areas, volume
-from snappy.sage_helper import _within_sage, doctest_modules
-import sys
-import getopt
-
-
-def check_certified_intervals():
-    for n in ['m009', 'm015', 't02333', 't02333(1,2)',
-              'm129(2,3)', 'm129(2,3)(3,4)']:
-        M = Manifold(n)
-        high_prec = M.tetrahedra_shapes('rect', bits_prec=1000)
-
-        intervals = M.tetrahedra_shapes('rect', bits_prec=100,
-                                        intervals=True)
-
-        for z, interval in zip(high_prec, intervals):
-            if not abs(interval.center() - z) < 1e-10:
-                raise Exception
-
-            if z not in interval:
-                raise Exception
+from snappy import testing
+import snappy
 
+from snappy import verify
 
 def generate_test_with_shapes_engine(module, engine):
-    def result(verbose):
-        globs = {'Manifold':Manifold}
+    def result(verbose, print_info=True):
+        globs = {'Manifold' : snappy.Manifold}
 
         original = verify.CertifiedShapesEngine
         verify.CertifiedShapesEngine = engine
 
-        r = doctest_modules([module], extraglobs=globs, verbose=verbose)
+        r = testing.doctest_modules([ module ],
+                                    verbose=verbose,
+                                    print_info=print_info,
+                                    extraglobs=globs)
 
         verify.CertifiedShapesEngine = original
 
@@ -39,43 +23,56 @@ def generate_test_with_shapes_engine(module, engine):
 
     return result
 
+modules = [
+    generate_test_with_shapes_engine(
+        verify.krawczyk_shapes_engine,
+        verify.KrawczykShapesEngine),
+    generate_test_with_shapes_engine(
+        verify.interval_newton_shapes_engine,
+        verify.IntervalNewtonShapesEngine),
+    generate_test_with_shapes_engine(
+        verify.hyperbolicity,
+        verify.KrawczykShapesEngine),
+    generate_test_with_shapes_engine(
+        verify.hyperbolicity,
+        verify.IntervalNewtonShapesEngine),
+    verify.canonical,
+    verify.interval_tree,
+    verify.volume,
+    verify.upper_halfspace.ideal_point,
+    verify.upper_halfspace.finite_point,
+    verify.upper_halfspace.extended_matrix,
+    verify.maximal_cusp_area_matrix,
+    verify.maximal_cusp_area_matrix.cusp_tiling_engine,
+    verify.maximal_cusp_area_matrix.cusp_translate_engine,
+    verify.square_extensions,
+    verify.real_algebra
+]
 
 def run_doctests(verbose=False, print_info=True):
-    globs = {'Manifold':Manifold}
-
-    return doctest_modules(
-        [
-            generate_test_with_shapes_engine(
-                verify.krawczyk_shapes_engine,
-                verify.KrawczykShapesEngine),
-            generate_test_with_shapes_engine(
-                verify.interval_newton_shapes_engine,
-                verify.IntervalNewtonShapesEngine),
-            verify.cuspCrossSection,
-            generate_test_with_shapes_engine(
-                verify.verifyHyperbolicity,
-                verify.KrawczykShapesEngine),
-            generate_test_with_shapes_engine(
-                verify.verifyHyperbolicity,
-                verify.IntervalNewtonShapesEngine),
-            verify.verifyCanonical,
-            verify.interval_tree,
-            volume,
-            cusp_areas,
-            cusp_shapes,
-            upper_halfspace.ideal_point,
-            upper_halfspace.finite_point,
-            upper_halfspace.extended_matrix,
-            verify.maximal_cusp_area_matrix,
-            verify.maximal_cusp_area_matrix.cusp_tiling_engine,
-            verify.maximal_cusp_area_matrix.cusp_translate_engine,
-            verify.squareExtensions,
-            verify.realAlgebra ],
-        extraglobs=globs,
-        verbose=verbose, print_info=print_info)
+    globs = {'Manifold' : snappy.Manifold}
+    return testing.doctest_modules(modules,
+                                   verbose=verbose,
+                                   print_info=print_info,
+                                   extraglobs=globs)
 
+run_doctests.__name__ = verify.__name__
+
+def check_certified_intervals():
+    for n in ['m009', 'm015', 't02333', 't02333(1,2)',
+              'm129(2,3)', 'm129(2,3)(3,4)']:
+        M = Manifold(n)
+        high_prec = M.tetrahedra_shapes('rect', bits_prec=1000)
+
+        intervals = M.tetrahedra_shapes('rect', bits_prec=100,
+                                        intervals=True)
+
+        for z, interval in zip(high_prec, intervals):
+            if not abs(interval.center() - z) < 1e-10:
+                raise Exception
+
+            if z not in interval:
+                raise Exception
 
 if __name__ == '__main__':
-    optlist, args = getopt.getopt(sys.argv[1:], 'v', ['verbose'])
-    verbose = len(optlist) > 0
-    run_doctests(verbose)
+    testing.run_doctests_as_main(run_doctests)

snappy/verify/upper_halfspace/extended_matrix.py

@@ -1,7 +1,7 @@
 from ...sage_helper import _within_sage
 
 if _within_sage:
-    from sage.all import sqrt
+    from ...sage_helper import sqrt
 
 __all__ = ['ExtendedMatrix']
 

snappy/verify/upper_halfspace/finite_point.py

@@ -1,9 +1,8 @@
 from ...sage_helper import _within_sage
 
 if _within_sage:
-    import sage.all
-    from sage.all import matrix, sqrt
-    from sage.rings.real_mpfi import is_RealIntervalFieldElement
+    import sage
+    from ...sage_helper import matrix, sqrt, is_RealIntervalFieldElement, Infinity
 
 from .extended_matrix import ExtendedMatrix
 
@@ -169,7 +168,7 @@ class FinitePoint():
         RIF = r.parent()
         if _within_sage:
             if is_RealIntervalFieldElement(r):
-                return r.intersection(RIF(1,sage.all.Infinity))
+                return r.intersection(RIF(1, Infinity))
         if r < 1.0:
             return RIF(1.0)
         return r

snappy/verify/upper_halfspace/ideal_point.py

@@ -17,8 +17,8 @@ and is different from the ``Infinity`` that comes from ``sage.all``.
 from ...sage_helper import _within_sage
 
 if _within_sage:
-    import sage.all
-    from sage.all import matrix
+    from ...sage_helper import I, matrix
+    from ...sage_helper import Infinity as sage_Infinity
 
 from .finite_point import *
 from .extended_matrix import *
@@ -169,7 +169,7 @@ def compute_inradius_and_incenter(idealPoints):
         sage: z1 = CIF(0)
         sage: z2 = CIF(1)
         sage: z3 = CIF(1.2, 1.0)
-        sage: compute_inradius_and_incenter([z0, z1, z2, z3])
+        sage: compute_inradius_and_incenter([z0, z1, z2, z3]) # doctest: +NUMERIC12
         (0.29186158033099?, FinitePoint(0.771123016231387? + 0.2791850380434060?*I, 0.94311979279000?))
     """
 
@@ -211,7 +211,7 @@ def Euclidean_height_of_hyperbolic_triangle(idealPoints):
         for idealPoint in idealPoints:
             if idealPoint != Infinity:
                 RIF = idealPoint.real().parent()
-                return RIF(sage.all.Infinity)
+                return RIF(sage_Infinity)
 
         raise Exception("What?")
 
@@ -266,7 +266,7 @@ def _transform_points_to_make_first_one_infinity_and_inv_sl_matrix(idealPoints):
     z = idealPoints[0]
     CIF = z.parent()
     gl_matrix = matrix(CIF, [[ 0, 1], [ 1, -z]])
-    sl_matrix = CIF(sage.all.I) * gl_matrix
+    sl_matrix = CIF(I) * gl_matrix
     inv_sl_matrix = _adjoint2(sl_matrix)
 
     # Apply it
@@ -352,6 +352,8 @@ def _compute_inradius_and_incenter_with_one_point_at_infinity(nonInfPoints):
     # We use the geometric mean of the Euclidean heights of the lowest and
     # highest point of the inscribed sphere
     # sqrt( (h + r) * (h - r))
+    #
+    # height is also equal to  (2 * length_product / length_total).sqrt()
     height = ( eHeightSqr - inRadiusSqr ).sqrt()
 
     # Taking the logarithm of the ratio of these two highest gives the
@@ -396,8 +398,7 @@ class _IdealPointTester():
     """
 
     def matrices(self):
-        from sage.all import RIF, CIF, matrix
-
+        from ...sage_helper import RIF, CIF
         return [
             matrix.identity(CIF, 2),
             matrix(
@@ -408,8 +409,7 @@ class _IdealPointTester():
                  [CIF(RIF(-0.3), RIF(1.1)), CIF(1)]]) ]
 
     def run_tests(self):
-        from sage.all import RIF, CIF
-
+        from ...sage_helper import RIF, CIF
         bias = RIF(1.5)
 
         triangle = [ CIF(0), Infinity, CIF(1) ]

snappy/verify/volume.py

@@ -15,7 +15,7 @@ if _within_sage:
 
 __all__ = ['compute_volume']
 
-from . import verifyHyperbolicity
+from . import hyperbolicity
 
 # Sage's handling of pari has a bug when it comes to precision and the dilog.
 # It computes the dilogarithm only to low precision even though higher precision
@@ -117,7 +117,7 @@ def compute_volume(manifold, verified, bits_prec=None):
 
     if verified:
         # If requested, check it is a valid hyperbolic structure
-        verifyHyperbolicity.check_logarithmic_gluing_equations_and_positively_oriented_tets(
+        hyperbolicity.check_logarithmic_gluing_equations_and_positively_oriented_tets(
             manifold, shape_intervals)
 
     # Sum up the volumes of all the tetrahedra

snappy/version.py

@@ -1,2 +1,2 @@
-version = '3.1.1'
-release_date = 'June 2023'
+version = '3.2'
+release_date = 'January 2025'

{snappy-3.1.1.dist-info → snappy-3.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: snappy
-Version: 3.1.1
+Version: 3.2
 Summary: Studying the topology and geometry of 3-manifolds, with a focus on hyperbolic structures.
 Home-page: http://snappy.computop.org
 Author: Marc Culler and Nathan M. Dunfield
@@ -16,17 +16,32 @@ Classifier: Programming Language :: C++
 Classifier: Programming Language :: Python
 Classifier: Programming Language :: Cython
 Classifier: Topic :: Scientific/Engineering :: Mathematics
-Requires-Python: >=3
+Requires-Python: >=3.8
 Description-Content-Type: text/x-rst
-Requires-Dist: plink (>=2.4.2)
-Requires-Dist: spherogram (>=2.2)
-Requires-Dist: FXrays (>=1.3)
-Requires-Dist: pypng
+Requires-Dist: FXrays>=1.3
+Requires-Dist: plink>=2.4.3
+Requires-Dist: spherogram>=2.3
+Requires-Dist: snappy_manifolds>=1.2.1
+Requires-Dist: low_index>=1.2.1
+Requires-Dist: tkinter-gl>=1.0
 Requires-Dist: decorator
-Requires-Dist: snappy-manifolds (>=1.1.2)
-Requires-Dist: low-index (>=1.2)
-Requires-Dist: cypari (>=2.3)
-Requires-Dist: ipython (>=1.0)
+Requires-Dist: packaging
+Requires-Dist: pypng
+Requires-Dist: PyX
+Requires-Dist: pickleshare
+Requires-Dist: cypari>=2.3
+Requires-Dist: ipython>=5.0
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: keywords
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 SnapPy
 ======