Skip to content

Commit 1a191bb

Browse files
committed
rewrite sage.all imports
1 parent e54d23a commit 1a191bb

File tree

6 files changed

+45
-41
lines changed

6 files changed

+45
-41
lines changed

sage_acsv/asymptotics.py

Lines changed: 17 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -116,20 +116,23 @@
116116

117117
from copy import copy
118118

119-
from sage.all import AA, PolynomialRing, QQ, QQbar, SR, DifferentialWeylAlgebra, Ideal
120-
from sage.all import (
121-
gcd,
122-
prod,
123-
pi,
124-
matrix,
125-
exp,
126-
log,
127-
I,
128-
factorial,
129-
srange,
130-
shuffle,
131-
vector,
132-
)
119+
from sage.algebras.weyl_algebra import DifferentialWeylAlgebra
120+
from sage.arith.misc import gcd
121+
from sage.arith.srange import srange
122+
from sage.functions.log import log, exp
123+
from sage.functions.other import factorial
124+
from sage.matrix.constructor import matrix
125+
from sage.misc.misc_c import prod
126+
from sage.misc.prandom import shuffle
127+
from sage.modules.free_module_element import vector
128+
from sage.rings.asymptotic.asymptotic_ring import AsymptoticRing
129+
from sage.rings.ideal import Ideal
130+
from sage.rings.imaginary_unit import I
131+
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
132+
from sage.rings.qqbar import AA, QQbar
133+
from sage.rings.rational_field import QQ
134+
from sage.symbolic.constants import pi
135+
from sage.symbolic.ring import SR
133136

134137
from sage_acsv.kronecker import _kronecker_representation
135138
from sage_acsv.helpers import (
@@ -337,8 +340,6 @@ def _diagonal_asymptotics_combinatorial_smooth(
337340
result = sum([a**n * b * c * d for (a, b, c, d) in result])
338341

339342
elif output_format == ACSVSettings.Output.ASYMPTOTIC:
340-
from sage.all import AsymptoticRing
341-
342343
AR = AsymptoticRing("QQbar^n * n^QQ", QQbar)
343344
n = AR.gen()
344345
result = sum(
@@ -789,8 +790,6 @@ def diagonal_asymptotics_combinatorial(
789790
result = sum([a**n * b * c * d for (a, b, c, d) in result])
790791

791792
elif output_format == ACSVSettings.Output.ASYMPTOTIC:
792-
from sage.all import AsymptoticRing
793-
794793
AR = AsymptoticRing("QQbar^n * n^QQ", QQbar)
795794
n = AR.gen()
796795
result = sum(

sage_acsv/backends/macaulay2.py

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
"""Interface to macaulay2."""
22

3-
from sage.all import PolynomialRing, QQ, Hom
3+
from sage.categories.homset import Hom
4+
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
5+
from sage.rings.rational_field import QQ
6+
47
from sage_acsv.settings import ACSVSettings
58

69

sage_acsv/helpers.py

Lines changed: 13 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,32 +4,27 @@
44

55
from dataclasses import dataclass
66

7+
from sage.arith.misc import gcd
8+
from sage.functions.generalized import kronecker_delta
9+
from sage.functions.other import ceil
10+
from sage.geometry.polyhedron.constructor import Polyhedron
711
from sage.groups.misc_gps.argument_groups import ArgumentByElementGroup
12+
from sage.matrix.constructor import matrix
13+
from sage.misc.misc_c import prod
14+
from sage.misc.prandom import randint
15+
from sage.modules.free_module_element import vector
816
from sage.rings.asymptotic.asymptotic_ring import AsymptoticRing, AsymptoticExpansion
917
from sage.rings.asymptotic.growth_group import (
1018
ExponentialGrowthGroup,
1119
MonomialGrowthGroup,
1220
)
13-
from sage.rings.qqbar import AlgebraicNumber, QQbar
21+
from sage.rings.ideal import Ideal
22+
from sage.rings.qqbar import AA, AlgebraicNumber, QQbar
23+
from sage.rings.rational_field import QQ
1424
from sage.symbolic.expression import Expression
15-
from sage.symbolic.ring import SymbolicRing
25+
from sage.symbolic.ring import SymbolicRing, SR
1626
from sage.symbolic.operators import add_vararg
17-
18-
from sage.all import (
19-
AA,
20-
QQ,
21-
SR,
22-
Ideal,
23-
Polyhedron,
24-
ceil,
25-
gcd,
26-
matrix,
27-
randint,
28-
vector,
29-
kronecker_delta,
30-
prod,
31-
pi,
32-
)
27+
from sage.symbolic.constants import pi
3328

3429

3530
@dataclass

sage_acsv/kronecker.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,10 @@
22
a system of polynomials.
33
"""
44

5-
from sage.all import PolynomialRing, QQ, gcd
5+
from sage.arith.misc import gcd
66
from sage.rings.polynomial.multi_polynomial_ideal import MPolynomialIdeal
7+
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
8+
from sage.rings.rational_field import QQ
79

810
from sage_acsv.helpers import ACSVException, generate_linear_form
911
from sage_acsv.debug import acsv_logger

sage_acsv/settings.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44

55
from enum import Enum
66

7+
from sage.interfaces.macaulay2 import Macaulay2
8+
79
from sage_acsv.debug import acsv_logger
8-
from sage.all import Macaulay2
910

1011

1112
class OutputFormat(Enum):

sage_acsv/whitney.py

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,11 @@
11
"""Functions related to computing Whitney stratifications."""
22

3-
from sage.all import Ideal, PolynomialRing, ProjectiveSpace, QQ
4-
from sage.all import Combinations, matrix
3+
from sage.combinat.combination import Combinations
4+
from sage.matrix.constructor import matrix
5+
from sage.rings.ideal import Ideal
6+
from sage.rings.polynomial.polynomial_ring_constructor import PolynomialRing
7+
from sage.rings.rational_field import QQ
8+
from sage.schemes.projective.projective_space import ProjectiveSpace
59

610
from sage_acsv.groebner import compute_primary_decomposition, compute_groebner_basis, compute_saturation, compute_radical
711

0 commit comments

Comments
 (0)