Skip to content

Commit

Permalink
Trac #27722: Remove old deprecation warning of Minkowski -> minkowski
Browse files Browse the repository at this point in the history
#23685 renamed the minkowski methods. It should now be removed.

URL: https://trac.sagemath.org/27722
Reported by: jipilab
Ticket author(s): Jean-Philippe Labbé
Reviewer(s): Frédéric Chapoton, Travis  Scrimshaw
  • Loading branch information
Release Manager authored and vbraun committed May 2, 2019
2 parents a8ddb6e + 5b9c9ae commit 947b608
Show file tree
Hide file tree
Showing 2 changed files with 0 additions and 41 deletions.
29 changes: 0 additions & 29 deletions src/sage/geometry/polyhedron/base.py
Expand Up @@ -2971,13 +2971,6 @@ def minkowski_sum(self, other):
sage: poly_eggs = Polyhedron([[5,4,5,4],[-4,5,-4,5],[4,-5,4,-5],[0,0,0,0]], base_ring=QQ)
sage: poly_spam + poly_spam + poly_eggs
A 4-dimensional polyhedron in QQ^4 defined as the convex hull of 12 vertices
TESTS::
sage: Z = X.Minkowski_sum(X)
doctest:warning...:
DeprecationWarning: Minkowski_sum is deprecated. Please use minkowski_sum instead.
See http://trac.sagemath.org/23685 for details.
"""
new_vertices = []
for v1 in self.vertex_generator():
Expand All @@ -2992,8 +2985,6 @@ def minkowski_sum(self, other):

_add_ = minkowski_sum

Minkowski_sum = deprecated_function_alias(23685, minkowski_sum)

@coerce_binop
def minkowski_difference(self, other):
r"""
Expand Down Expand Up @@ -3082,13 +3073,6 @@ def minkowski_difference(self, other):
True
sage: (X-Y)+Y == X
True
TESTS::
sage: Z = X.Minkowski_difference(X)
doctest:warning...:
DeprecationWarning: Minkowski_difference is deprecated. Please use minkowski_difference instead.
See http://trac.sagemath.org/23685 for details.
"""
if other.is_empty():
return self.parent().universe() # empty intersection = everything
Expand All @@ -3110,9 +3094,6 @@ def minkowski_difference(self, other):
P = self.parent()
return P.element_class(P, None, [new_ieqs, new_eqns])

Minkowski_difference = deprecated_function_alias(23685,
minkowski_difference)

def __sub__(self, other):
r"""
Implement minus binary operation
Expand Down Expand Up @@ -3178,19 +3159,9 @@ def is_minkowski_summand(self, Y):
False
sage: C.is_minkowski_summand(B)
False
TESTS::
sage: b = C.is_Minkowski_summand(B)
doctest:warning...:
DeprecationWarning: is_Minkowski_summand is deprecated. Please use is_minkowski_summand instead.
See http://trac.sagemath.org/23685 for details.
"""
return self.minkowski_difference(Y).minkowski_sum(Y) == self

is_Minkowski_summand = deprecated_function_alias(23685,
is_minkowski_summand)

def translation(self, displacement):
"""
Return the translated polyhedron.
Expand Down
12 changes: 0 additions & 12 deletions src/sage/geometry/polyhedron/base_ZZ.py
Expand Up @@ -20,7 +20,6 @@
from sage.arith.all import gcd
from .constructor import Polyhedron
from .base import Polyhedron_base
from sage.misc.superseded import deprecated_function_alias


#########################################################################
Expand Down Expand Up @@ -515,14 +514,6 @@ def minkowski_decompositions(self):
[1, 2, 5, 8, 13, 18]
sage: [ ceil((i^2+2*i-1)/2)+1 for i in range(10) ]
[1, 2, 5, 8, 13, 18, 25, 32, 41, 50]
TESTS::
sage: Q = Polyhedron(vertices=[(4,0), (6,0), (0,3), (4,3)])
sage: D = Q.Minkowski_decompositions()
doctest:warning...:
DeprecationWarning: Minkowski_decompositions is deprecated. Please use minkowski_decompositions instead.
See http://trac.sagemath.org/23685 for details.
"""
if self.dim() > 2 or not self.is_compact():
raise NotImplementedError('only implemented for bounded polygons')
Expand All @@ -544,6 +535,3 @@ def is_known_summand(poly):
decompositions.append((X, Y))
summands += [X, Y]
return tuple(decompositions)

Minkowski_decompositions = deprecated_function_alias(23685,
minkowski_decompositions)

0 comments on commit 947b608

Please sign in to comment.