Skip to content
This repository has been archived by the owner on Jan 30, 2023. It is now read-only.

Commit

Permalink
rename number_field in the output of Polyhedron_base_number_field._co…
Browse files Browse the repository at this point in the history
…mpute_data_lists_and_internal_base_ring to internal_base_ring
  • Loading branch information
yuan-zhou committed Sep 9, 2022
1 parent 8380bb1 commit 6b661a1
Show file tree
Hide file tree
Showing 2 changed files with 26 additions and 24 deletions.
38 changes: 20 additions & 18 deletions src/sage/geometry/polyhedron/backend_field.py
Original file line number Diff line number Diff line change
Expand Up @@ -162,25 +162,26 @@ def _init_from_Vrepresentation_and_Hrepresentation(self, Vrep, Hrep):
self._init_Hrepresentation(*Hrep)

def _init_from_Vrepresentation(self, vertices, rays, lines,
minimize=True, verbose=False, number_field=None):
minimize=True, verbose=False,
internal_base_ring=None):
"""
Construct polyhedron from V-representation data.
INPUT:
- ``vertices`` -- list of points. Each point can be specified
as any iterable container of ``number_field`` elements.
as any iterable container of ``internal_base_ring`` elements.
- ``rays`` -- list of rays. Each ray can be specified as any
iterable container of ``number_field`` elements.
iterable container of ``internal_base_ring`` elements.
- ``lines`` -- list of lines. Each line can be specified as
any iterable container of ``number_field`` elements.
- ``lines`` -- list of lines. Each line can be specified asinternal_base_ring
any iterable container of ``internal_base_ring`` elements.
- ``verbose`` -- boolean (default: ``False``). Whether to print
verbose output for debugging purposes.
- ``number_field`` -- the number field of the generators' components.
- ``internal_base_ring`` -- the base ring of the generators' components.
Defualt is ``None``, in which case, it is set to
:meth:`~sage.geometry.polyhedron.base.base_ring`.
Expand All @@ -190,32 +191,33 @@ def _init_from_Vrepresentation(self, vertices, rays, lines,
sage: from sage.geometry.polyhedron.backend_field import Polyhedron_field
sage: Polyhedron_field._init_from_Vrepresentation(p, [(0,0)], [], [])
"""
if number_field is None:
number_field = self.base_ring()
if internal_base_ring is None:
internal_base_ring = self.base_ring()
from sage.geometry.polyhedron.double_description_inhomogeneous import Hrep2Vrep, Vrep2Hrep
H = Vrep2Hrep(number_field, self.ambient_dim(), vertices, rays, lines)
V = Hrep2Vrep(number_field, self.ambient_dim(),
H = Vrep2Hrep(internal_base_ring, self.ambient_dim(), vertices, rays, lines)
V = Hrep2Vrep(internal_base_ring, self.ambient_dim(),
H.inequalities, H.equations)
self._init_Vrepresentation_backend(V)
self._init_Hrepresentation_backend(H)

def _init_from_Hrepresentation(self, ieqs, eqns,
minimize=True, verbose=False, number_field=None):
minimize=True, verbose=False,
internal_base_ring=None):
"""
Construct polyhedron from H-representation data.
INPUT:
- ``ieqs`` -- list of inequalities. Each line can be specified
as any iterable container of ``number_field`` elements.
as any iterable container of ``internal_base_ring`` elements.
- ``eqns`` -- list of equalities. Each line can be specified
as any iterable container of ``number_field`` elements.
as any iterable container of ``internal_base_ring`` elements.
- ``verbose`` -- boolean (default: ``False``). Whether to print
verbose output for debugging purposes.
- ``number_field`` -- the number field of the generators' components.
- ``internal_base_ring`` -- the base ring of the generators' components.
Defualt is ``None``, in which case, it is set to
:meth:`~sage.geometry.polyhedron.base.base_ring`.
Expand All @@ -225,11 +227,11 @@ def _init_from_Hrepresentation(self, ieqs, eqns,
sage: from sage.geometry.polyhedron.backend_field import Polyhedron_field
sage: Polyhedron_field._init_from_Hrepresentation(p, [(1, 2, 3)], [])
"""
if number_field is None:
number_field = self.base_ring()
if internal_base_ring is None:
internal_base_ring = self.base_ring()
from sage.geometry.polyhedron.double_description_inhomogeneous import Hrep2Vrep, Vrep2Hrep
V = Hrep2Vrep(number_field, self.ambient_dim(), ieqs, eqns)
H = Vrep2Hrep(number_field, self.ambient_dim(),
V = Hrep2Vrep(internal_base_ring, self.ambient_dim(), ieqs, eqns)
H = Vrep2Hrep(internal_base_ring, self.ambient_dim(),
V.vertices, V.rays, V.lines)
self._init_Vrepresentation_backend(V)
self._init_Hrepresentation_backend(H)
Expand Down
12 changes: 6 additions & 6 deletions src/sage/geometry/polyhedron/backend_number_field.py
Original file line number Diff line number Diff line change
Expand Up @@ -121,13 +121,13 @@ def _init_from_Vrepresentation(self, vertices, rays, lines,
sage: p.vertices()[0][0]
0
"""
(vertices, rays, lines), number_field \
(vertices, rays, lines), internal_base_ring \
= self._compute_data_lists_and_internal_base_ring((vertices, rays, lines),
lambda *x: x, lambda *x: x)
self._number_field = number_field
self._internal_base_ring = internal_base_ring
super()._init_from_Vrepresentation(vertices, rays, lines,
minimize=minimize, verbose=verbose,
number_field=number_field)
internal_base_ring=internal_base_ring)

def _init_from_Hrepresentation(self, ieqs, eqns, minimize=True, verbose=False):
"""
Expand All @@ -152,10 +152,10 @@ def _init_from_Hrepresentation(self, ieqs, eqns, minimize=True, verbose=False):
sage: from sage.geometry.polyhedron.backend_number_field import Polyhedron_number_field
sage: Polyhedron_number_field._init_from_Hrepresentation(p, [(1, 2, 3)], [])
"""
(ieqs, eqns), number_field \
(ieqs, eqns), internal_base_ring \
= self._compute_data_lists_and_internal_base_ring((ieqs, eqns),
lambda *x: x, lambda *x: x)
self._number_field = number_field
self._internal_base_ring = internal_base_ring
super()._init_from_Hrepresentation(ieqs, eqns,
minimize=minimize, verbose=verbose,
number_field=number_field)
internal_base_ring=internal_base_ring)

0 comments on commit 6b661a1

Please sign in to comment.