Skip to content

Commit

Permalink
Merge branch 'master' of github.com:3-manifolds/SnapPy
Browse files Browse the repository at this point in the history
  • Loading branch information
culler committed Jan 14, 2025
2 parents 9887d39 + a67b88e commit 2f4925e
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 2 deletions.
3 changes: 2 additions & 1 deletion python/sage_helper.py
Original file line number Diff line number Diff line change
Expand Up @@ -37,10 +37,11 @@ def sage_method(function):
from sage.all import VectorSpace, ChainComplex
from sage.all import ComplexBallField, exp, sin, block_matrix, prime_range, det
from sage.all import LaurentPolynomialRing, AbelianGroup, GroupAlgebra
from sage.all import is_prime
except ImportError:
# Modularized Sage library
from sage.algebras.group_algebra import GroupAlgebra
from sage.arith.misc import gcd, xgcd
from sage.arith.misc import gcd, xgcd, is_prime
from sage.combinat.subset import powerset
from sage.functions.hyperbolic import arccosh
from sage.functions.log import exp
Expand Down
2 changes: 1 addition & 1 deletion python/snap/slice_obs_HKL.py
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@

from ..sage_helper import _within_sage, sage_method
if _within_sage:
from ..sage_helper import ZZ, PolynomialRing, vector, matrix, identity_matrix, MatrixSpace, block_matrix, prime_range
from ..sage_helper import ZZ, PolynomialRing, vector, matrix, identity_matrix, MatrixSpace, block_matrix, prime_range, is_prime
from ..sage_helper import LaurentPolynomialRing, GF, CyclotomicField, ChainComplex

from .nsagetools import (MapToFreeAbelianization, compute_torsion,
Expand Down

0 comments on commit 2f4925e

Please sign in to comment.