Merge branch 'u/mkoeppe/avoid_ceil__floor_from_sage_functions_other_in_non_symbolic_uses' of git://trac.sagemath.org/sage into t/32601/modularization_of_sagelib__break_out_a_separate_package_sagemath_standard_no_symbolics

Author: mkoeppe

src/sage/arith/misc.py

@@ -5031,6 +5031,24 @@ def integer_floor(x):
     raise NotImplementedError("computation of floor of %s not implemented"%x)
 
 
+def integer_trunc(i):
+    """
+    Truncate to the integer closer to zero
+
+    EXAMPLES::
+
+        sage: from sage.arith.misc import integer_trunc as trunc
+        sage: trunc(-3/2), trunc(-1), trunc(-1/2), trunc(0), trunc(1/2), trunc(1), trunc(3/2)
+        (-1, -1, 0, 0, 0, 1, 1)
+        sage: isinstance(trunc(3/2), Integer)
+        True
+    """
+    if i >= 0:
+        return integer_floor(i)
+    else:
+        return integer_ceil(i)
+
+
 def two_squares(n):
     """
     Write the integer `n` as a sum of two integer squares if possible;

src/sage/combinat/crystals/littelmann_path.py

@@ -40,8 +40,7 @@
 from sage.rings.integer import Integer
 from sage.rings.rational_field import QQ
 from sage.combinat.root_system.root_system import RootSystem
-from sage.misc.lazy_import import lazy_import
-lazy_import("sage.functions.other", "floor")
+from sage.arith.misc import integer_floor as floor
 from sage.misc.latex import latex
 
 

src/sage/combinat/crystals/tensor_product.py

@@ -52,28 +52,8 @@
 from sage.misc.flatten import flatten
 from sage.structure.element import get_coercion_model
 from sage.rings.semirings.non_negative_integer_semiring import NN
+from sage.arith.misc import integer_trunc as trunc
 
-##############################################################################
-# Until trunc gets implemented in sage.function.other
-
-from sage.misc.lazy_import import lazy_import
-lazy_import("sage.functions.other", "floor", "ceil")
-def trunc(i):
-    """
-    Truncates to the integer closer to zero
-
-    EXAMPLES::
-
-        sage: from sage.combinat.crystals.tensor_product import trunc
-        sage: trunc(-3/2), trunc(-1), trunc(-1/2), trunc(0), trunc(1/2), trunc(1), trunc(3/2)
-        (-1, -1, 0, 0, 0, 1, 1)
-        sage: isinstance(trunc(3/2), Integer)
-        True
-    """
-    if i>= 0:
-        return floor(i)
-    else:
-        return ceil(i)
 
 ##############################################################################
 # Support classes

src/sage/combinat/diagram_algebras.py

@@ -43,8 +43,8 @@
 from sage.misc.misc_c import prod
 from sage.rings.integer_ring import ZZ
 from sage.rings.rational_field import QQ
-from sage.misc.lazy_import import lazy_import
-lazy_import("sage.functions.other", "floor", "ceil")
+from sage.arith.misc import integer_floor as floor
+from sage.arith.misc import integer_ceil as ceil
 
 import itertools
 

src/sage/geometry/polyhedron/backend_normaliz.py

@@ -1538,7 +1538,7 @@ def _volume_normaliz(self, measure='euclidean'):
                 from sage.rings.infinity import infinity
                 return infinity
 
-            from sage.functions.other import factorial
+            from sage.arith.misc import factorial
             return self._volume_normaliz('induced_lattice') / factorial(self.dim())
 
         else:

src/sage/geometry/polyhedron/base.py

@@ -47,11 +47,10 @@
 from sage.modules.free_module_element import vector
 from sage.modules.vector_space_morphism import linear_transformation
 from sage.matrix.constructor import matrix
+from sage.arith.misc import integer_floor as floor
+from sage.arith.misc import integer_ceil as ceil
 from sage.misc.lazy_import import lazy_import
-lazy_import("sage.functions.other", "floor", "ceil")
-from sage.misc.functional import sqrt
-from sage.groups.matrix_gps.finitely_generated import MatrixGroup
-from sage.graphs.graph import Graph
+lazy_import('sage.groups.matrix_gps.finitely_generated', 'MatrixGroup')
 from sage.geometry.convex_set import ConvexSet_closed, AffineHullProjectionData
 
 import sage.geometry.abc
@@ -3419,7 +3418,7 @@ def radius(self):
             sage: p.radius()
             2
         """
-        return sqrt(self.radius_square())
+        return self.radius_square().sqrt()
 
     def is_inscribed(self, certificate=False):
         """
@@ -8988,7 +8987,7 @@ def integrate(self, function, measure='ambient', **kwds):
                     Adet = AA.coerce(Adet)
                 except TypeError:
                     pass
-                return I / sqrt(Adet)
+                return I / Adet.sqrt()
 
         else:
             raise ValueError('unknown measure "{}"'.format(measure))
@@ -10527,6 +10526,7 @@ def edge_label(i, j, c_ij):
         Qplus = sum(v.column() * v.row() for v in V).pseudoinverse()
 
         # Construct the graph.
+        from sage.graphs.graph import Graph
         G = Graph()
         for i in range(len(V)):
             for j in range(i+1, len(V)):

src/sage/geometry/polyhedron/combinatorial_polyhedron/base.pyx

@@ -1854,7 +1854,7 @@ cdef class CombinatorialPolyhedron(SageObject):
         if self.is_simplex():
             return self.dim() + 1
         else:
-            from sage.functions.other import binomial
+            from sage.arith.misc import binomial
             k = 1
             while self.f_vector()[k+1] == binomial(self.n_vertices(), k + 1):
                 k += 1
@@ -1904,7 +1904,7 @@ cdef class CombinatorialPolyhedron(SageObject):
             sage: C.is_neighborly(k=2)
             True
         """
-        from sage.functions.other import binomial
+        from sage.arith.misc import binomial
         if k is None:
             k = self.dim() // 2
         return all(self.f_vector()[i+1] == binomial(self.n_vertices(), i + 1)

src/sage/graphs/generic_graph.py

@@ -9272,7 +9272,7 @@ def _ford_fulkerson(self, s, t, use_edge_labels=False, integer=False, value_only
             0
         """
         from sage.graphs.digraph import DiGraph
-        from sage.functions.other import floor
+        from sage.arith.misc import integer_floor as floor
 
         # Whether we should consider the edges labeled
         if use_edge_labels:

src/sage/graphs/hyperbolicity.pyx

@@ -158,7 +158,6 @@ from sage.graphs.distances_all_pairs cimport c_distances_all_pairs
 from sage.arith.all import binomial
 from sage.rings.integer_ring import ZZ
 from sage.rings.real_mpfr import RR
-from sage.functions.other import floor
 from sage.data_structures.bitset import Bitset
 from sage.graphs.base.static_sparse_graph cimport short_digraph
 from sage.graphs.base.static_sparse_graph cimport init_short_digraph