From 5b1eccb017d5b38e9e46aca56a97a685e62d3e46 Mon Sep 17 00:00:00 2001 From: Michael Orlitzky Date: Mon, 3 Aug 2015 12:29:32 -0400 Subject: [PATCH] Trac #18454: Remove some excessive doctests for random_cone(). There were a number of doctests for random_cone() that merely checked different combinations of its parameters. This created a lot of almost-duplicate code, and slowed down testing somewhat. This commit removes the extra tests. --- src/sage/geometry/cone.py | 151 -------------------------------------- 1 file changed, 151 deletions(-) diff --git a/src/sage/geometry/cone.py b/src/sage/geometry/cone.py index 6b47b137fbf..ba8665604c8 100644 --- a/src/sage/geometry/cone.py +++ b/src/sage/geometry/cone.py @@ -4421,23 +4421,6 @@ def random_cone(lattice=None, min_ambient_dim=0, max_ambient_dim=None, sage: K.lattice_dim() 3 - This should be possible when ``strictly_convex`` is set as well:: - - sage: set_random_seed() - sage: K = random_cone(max_ambient_dim=3, min_rays=5, - ....: strictly_convex=True) - sage: K.nrays() >= 5 - True - sage: K.lattice_dim() - 3 - - sage: K = random_cone(max_ambient_dim=3, min_rays=5, - ....: strictly_convex=False) - sage: K.nrays() >= 5 - True - sage: K.lattice_dim() - 3 - Ensure that we can generate cones which are not strictly convex:: sage: set_random_seed() @@ -4458,55 +4441,6 @@ def random_cone(lattice=None, min_ambient_dim=0, max_ambient_dim=None, sage: all(l) True - If we fix all of the parameters, we can still request - (non-)strictly-convex cones:: - - sage: set_random_seed() - sage: K = random_cone(min_ambient_dim=2, max_ambient_dim=2, - ....: min_rays=3, max_rays=3, strictly_convex=False) - sage: K.nrays() - 3 - sage: K.lattice_dim() - 2 - sage: K.is_strictly_convex() - False - - sage: K = random_cone(min_ambient_dim=3, max_ambient_dim=3, - ....: min_rays=3, max_rays=3, strictly_convex=True) - sage: K.nrays() - 3 - sage: K.lattice_dim() - 3 - sage: K.is_strictly_convex() - True - - sage: K = random_cone(min_ambient_dim=3, max_ambient_dim=3, - ....: min_rays=3, max_rays=3, strictly_convex=False) - sage: K.nrays() - 3 - sage: K.lattice_dim() - 3 - sage: K.is_strictly_convex() - False - - sage: K = random_cone(min_ambient_dim=3, max_ambient_dim=3, - ....: min_rays=4, max_rays=4, strictly_convex=True) - sage: K.nrays() - 4 - sage: K.lattice_dim() - 3 - sage: K.is_strictly_convex() - True - - sage: K = random_cone(min_ambient_dim=3, max_ambient_dim=3, - ....: min_rays=4, max_rays=4, strictly_convex=False) - sage: K.nrays() - 4 - sage: K.lattice_dim() - 3 - sage: K.is_strictly_convex() - False - It is an error to request a non-strictly-convex trivial cone:: sage: set_random_seed() @@ -4615,91 +4549,6 @@ def random_cone(lattice=None, min_ambient_dim=0, max_ambient_dim=None, ValueError: every cone is solid when min_rays > 2*(d - 1) where d is the dimension of the given lattice. - Check all four combinations of ``strictly_convex`` and ``solid``:: - - sage: set_random_seed() - sage: K = random_cone(strictly_convex=True, solid=True) # long time - sage: K.is_solid() # long time - True - sage: K.is_strictly_convex() # long time - True - - sage: K = random_cone(strictly_convex=False, solid=True) # long time - sage: K.is_solid() # long time - True - sage: K.is_strictly_convex() # long time - False - - sage: K = random_cone(strictly_convex=False, solid=False) # long time - sage: K.is_solid() # long time - False - sage: K.is_strictly_convex() # long time - False - - sage: K = random_cone(strictly_convex=True, solid=False) # long time - sage: K.is_solid() # long time - False - sage: K.is_strictly_convex() # long time - True - - If we fix all of the parameters, we can still request (non-)solid - cones:: - - sage: set_random_seed() - sage: K = random_cone(min_ambient_dim=3, max_ambient_dim=3, - ....: min_rays=4, max_rays=4, solid=True) - sage: K.nrays() - 4 - sage: K.lattice_dim() - 3 - sage: K.is_solid() - True - - sage: K = random_cone(min_ambient_dim=3, max_ambient_dim=3, - ....: min_rays=4, max_rays=4, solid=False) - sage: K.nrays() - 4 - sage: K.lattice_dim() - 3 - sage: K.is_solid() - False - - sage: K = random_cone(min_ambient_dim=4, max_ambient_dim=4, - ....: min_rays=4, max_rays=4, solid=True) - sage: K.nrays() - 4 - sage: K.lattice_dim() - 4 - sage: K.is_solid() - True - - sage: K = random_cone(min_ambient_dim=4, max_ambient_dim=4, - ....: min_rays=4, max_rays=4, solid=False) - sage: K.nrays() - 4 - sage: K.lattice_dim() - 4 - sage: K.is_solid() - False - - sage: K = random_cone(min_ambient_dim=4, max_ambient_dim=4, - ....: min_rays=5, max_rays=5, solid=True) - sage: K.nrays() - 5 - sage: K.lattice_dim() - 4 - sage: K.is_solid() - True - - sage: K = random_cone(min_ambient_dim=4, max_ambient_dim=4, - ....: min_rays=5, max_rays=5, solid=False) - sage: K.nrays() - 5 - sage: K.lattice_dim() - 4 - sage: K.is_solid() - False - """ # Catch obvious mistakes so that we can generate clear error