From fdc8c27a7ffff48504add39a100e6057b9388e9d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julian=20R=C3=BCth?= Date: Wed, 8 Nov 2023 21:07:59 +0200 Subject: [PATCH] Actually update license to GPLv2+ fixes https://github.com/flatsurf/veerer/issues/25 and fix whitespace errors --- .zenodo.json | 2 +- COPYING | 339 ++++++++++++++++++++ setup.py | 16 +- tests/test_quadrangulation_flip_sequence.py | 4 +- veerer/__init__.py | 12 +- veerer/automaton.py | 22 +- veerer/constants.py | 12 +- veerer/cover.py | 14 +- veerer/env.py | 12 +- veerer/flat_structure.py | 12 +- veerer/flip_sequence.py | 12 +- veerer/layout.py | 12 +- veerer/linear_family.py | 12 +- veerer/measured_train_track.py | 16 +- veerer/misc.py | 12 +- veerer/permutation.pyx | 12 +- veerer/polyhedron/cone.py | 12 +- veerer/polyhedron/linear_algebra.py | 12 +- veerer/polyhedron/linear_expression.py | 12 +- veerer/triangulation.py | 18 +- veerer/veering_quadrangulation.py | 12 +- veerer/veering_triangulation.py | 16 +- 22 files changed, 490 insertions(+), 113 deletions(-) create mode 100644 COPYING diff --git a/.zenodo.json b/.zenodo.json index 5f35887..3f2aefe 100644 --- a/.zenodo.json +++ b/.zenodo.json @@ -15,7 +15,7 @@ } ], - "license": "GPL-3.0-or-later", + "license": "GPL-2.0-or-later", "title": "veerer", "description": "

Veerer is a Python package to deal with veering triangulations of surfaces and their associated flat structures.

" } diff --git a/COPYING b/COPYING new file mode 100644 index 0000000..d159169 --- /dev/null +++ b/COPYING @@ -0,0 +1,339 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) You can apply it to +your programs, too. + + When we speak of free software, we are referring to freedom, not +price. Our General Public Licenses are designed to make sure that you +have the freedom to distribute copies of free software (and charge for +this service if you wish), that you receive source code or can get it +if you want it, that you can change the software or use pieces of it +in new free programs; and that you know you can do these things. + + To protect your rights, we need to make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. You must make sure that they, too, receive or can get the +source code. And you must show them these terms so they know their +rights. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute verbatim copies of the Program's +source code as you receive it, in any medium, provided that you +conspicuously and appropriately publish on each copy an appropriate +copyright notice and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the General Public License from time to time. Such new versions will +be similar in spirit to the present version, but may differ in detail to +address new problems or concerns. + +Each version is given a distinguishing version number. If the Program +specifies a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY +FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN +OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES +PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED +OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF +MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS +TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE +PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, +REPAIR OR CORRECTION. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, +INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING +OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED +TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY +YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER +PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE +POSSIBILITY OF SUCH DAMAGES. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs + + If you develop a new program, and you want it to be of the greatest +possible use to the public, the best way to achieve this is to make it +free software which everyone can redistribute and change under these terms. + + To do so, attach the following notices to the program. It is safest +to attach them to the start of each source file to most effectively +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or + (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + You should have received a copy of the GNU General Public License along + with this program; if not, write to the Free Software Foundation, Inc., + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + This is free software, and you are welcome to redistribute it + under certain conditions; type `show c' for details. + +The hypothetical commands `show w' and `show c' should show the appropriate +parts of the General Public License. Of course, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This General Public License does not permit incorporating your program into +proprietary programs. If your program is a subroutine library, you may +consider it more useful to permit linking proprietary applications with the +library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. diff --git a/setup.py b/setup.py index 88b2f7b..096a724 100644 --- a/setup.py +++ b/setup.py @@ -4,17 +4,19 @@ # Copyright (C) 2019-2023 Vincent Delecroix # 2023 Julian Rüth # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** from setuptools import setup, Extension from Cython.Build import cythonize @@ -35,14 +37,14 @@ author_email="contact@flatsurf.org", url="https://github.com/flatsurf/veerer", packages=["veerer", "veerer.polyhedron"], - license="GNU General Public License, version 3", + license = 'GPL 2.0+', ext_modules=cythonize(extensions), install_requires=[], setup_requires=["Cython"], classifiers=[ "Development Status :: 4 - Beta", "Intended Audience :: Science/Research", - "License :: OSI Approved :: GNU General Public License v3 (GPLv3)", + "License :: OSI Approved :: GNU General Public License v2 or later (GPLv2+)", "Natural Language :: English", "Operating System :: OS Independent", "Programming Language :: Python", diff --git a/tests/test_quadrangulation_flip_sequence.py b/tests/test_quadrangulation_flip_sequence.py index c5d8cad..f06406f 100644 --- a/tests/test_quadrangulation_flip_sequence.py +++ b/tests/test_quadrangulation_flip_sequence.py @@ -136,7 +136,7 @@ def test_failure_conjugate_in_H6(): [((1,), (1,)), ((1,), (1,)), ((0,), (1,)), ((5,), (1,))], "(0,4,1,5,2,6,3)"), ("(0,6,5)(1,4,3,2)", "(0,6)(1,2,5)(3,4)", - [((1,), (1,)), ((4,), (1,)), ((1,), (1,)), ((1,), (1,))], + [((1,), (1,)), ((4,), (1,)), ((1,), (1,)), ((1,), (1,))], "(0,4,1,5,2,6,3)"), ("(0,4,2)(1)(3)(5,6)", "(0,5,6)(1,2,3,4)", [((1,), (1,)), ((1,), (1,)), ((0,), (1,)), ((0,), (1,))], @@ -177,7 +177,7 @@ def test_failure_conjugate_in_H6(): # ("(0,3,2,1)", "(0,2)(1)(3)", [((0,), (2,)), ((0, 3, 2), (0, 0, 1))], "(0,1,2,3)"), # ("(0,2)(1)(3)", "(0,1,2,3)", [((0, 1, 3), (0, 1, 0)), ((1,), (2,))], "(0,3,2,1)"), # ("(0,2)(1)(3)", "(0,1,2,3)", [((0, 1, 3), (0, 0, 1)), ((3,), (2,))], "(0,3,2,1)")] -# +# # flip_sequences = [VeeringQuadrangulationFlipSequence(VeeringQuadrangulation(pr, pl), flips, relabelling) for pr, pl, flips, relabelling in data] # # N = len(flip_sequences) diff --git a/veerer/__init__.py b/veerer/__init__.py index e224cb9..38586db 100644 --- a/veerer/__init__.py +++ b/veerer/__init__.py @@ -9,17 +9,19 @@ # # Copyright (C) 2023 Vincent Delecroix # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** from .constants import RED, BLUE, PURPLE, GREEN, HORIZONTAL, VERTICAL, RIGHT, LEFT, UP, DOWN diff --git a/veerer/automaton.py b/veerer/automaton.py index e54f7e9..bd9fb7f 100644 --- a/veerer/automaton.py +++ b/veerer/automaton.py @@ -8,17 +8,19 @@ # 2018-2023 Vincent Delecroix # 2018 Saul Schleimer # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** import os @@ -945,7 +947,7 @@ class GeometricAutomatonSubspace(Automaton): n=6: Geometric veering linear constraint automaton with 800 vertices """ _name = 'geometric veering linear constraint' - + def _setup(self, backend=None): self._backend = backend diff --git a/veerer/constants.py b/veerer/constants.py index ccc3145..9a95496 100644 --- a/veerer/constants.py +++ b/veerer/constants.py @@ -12,17 +12,19 @@ # 2018-2023 Vincent Delecroix # 2018 Saul Schleimer # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** NONE = 0 diff --git a/veerer/cover.py b/veerer/cover.py index df9c673..baac203 100644 --- a/veerer/cover.py +++ b/veerer/cover.py @@ -8,17 +8,19 @@ # 2018-2023 Vincent Delecroix # 2018 Saul Schleimer # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** from array import array @@ -94,7 +96,7 @@ def __init__(self, triangulation, cover, mutable=False, check=True): for i,p in enumerate(cover): if p is None: cover[i] = perm_init(range(d)) - + ep = self._t.edge_permutation(copy=False) n = self._t.num_half_edges() ne = self._t.num_edges() diff --git a/veerer/env.py b/veerer/env.py index 3e9e076..aad5654 100644 --- a/veerer/env.py +++ b/veerer/env.py @@ -10,17 +10,19 @@ # # Copyright (C) 2023 Vincent Delecroix # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** CHECK = False diff --git a/veerer/flat_structure.py b/veerer/flat_structure.py index 91e61a9..4e2e357 100644 --- a/veerer/flat_structure.py +++ b/veerer/flat_structure.py @@ -6,17 +6,19 @@ # # Copyright (C) 2018-2023 Vincent Delecroix # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** from sage.structure.sequence import Sequence diff --git a/veerer/flip_sequence.py b/veerer/flip_sequence.py index d382d61..ccff679 100644 --- a/veerer/flip_sequence.py +++ b/veerer/flip_sequence.py @@ -41,17 +41,19 @@ # # Copyright (C) 2020 Vincent Delecroix # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** from .constants import colour_from_char, colour_to_char, RED, BLUE, PURPLE, GREEN, HORIZONTAL, VERTICAL diff --git a/veerer/layout.py b/veerer/layout.py index 33b367a..3002558 100644 --- a/veerer/layout.py +++ b/veerer/layout.py @@ -18,17 +18,19 @@ # 2018-2023 Vincent Delecroix # 2018 Saul Schleimer # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** import math diff --git a/veerer/linear_family.py b/veerer/linear_family.py index a9587cf..41cbe4c 100644 --- a/veerer/linear_family.py +++ b/veerer/linear_family.py @@ -6,17 +6,19 @@ # # Copyright (C) 2023 Vincent Delecroix # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** from array import array diff --git a/veerer/measured_train_track.py b/veerer/measured_train_track.py index 3f885b6..a4d19bf 100644 --- a/veerer/measured_train_track.py +++ b/veerer/measured_train_track.py @@ -3,17 +3,19 @@ # # Copyright (C) 2018-2023 Vincent Delecroix # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** from sage.categories.fields import Fields @@ -80,7 +82,7 @@ def lengths(self): def __repr__(self): return "MeasuredTrainTrack({}, {})".format( self._triangulation, self._lengths) - + def __call__(self, p, iterations=1): r""" p = (i,x) where @@ -89,7 +91,7 @@ def __call__(self, p, iterations=1): EXAMPLES:: - sage: from veerer import * + sage: from veerer import * sage: v0 = vector((1, 0, 1, 1)) sage: v1 = vector((0, 1, 1, 1)) sage: t = Triangulation("(0,1,2)(~0,~1,3)") diff --git a/veerer/misc.py b/veerer/misc.py index 3eaf41b..c2019a6 100644 --- a/veerer/misc.py +++ b/veerer/misc.py @@ -6,17 +6,19 @@ # # Copyright (C) 2018-2023 Vincent Delecroix # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** from .env import ppl diff --git a/veerer/permutation.pyx b/veerer/permutation.pyx index 6654d68..4e5dbed 100644 --- a/veerer/permutation.pyx +++ b/veerer/permutation.pyx @@ -15,17 +15,19 @@ TODO: # 2018-2023 Vincent Delecroix # 2018 Saul Schleimer # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** from cpython cimport array diff --git a/veerer/polyhedron/cone.py b/veerer/polyhedron/cone.py index b6803db..49f90af 100644 --- a/veerer/polyhedron/cone.py +++ b/veerer/polyhedron/cone.py @@ -71,17 +71,19 @@ # # Copyright (C) 2023 Vincent Delecroix # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** from ..env import sage, ppl, PyNormaliz diff --git a/veerer/polyhedron/linear_algebra.py b/veerer/polyhedron/linear_algebra.py index 3bebf05..2a62f0d 100644 --- a/veerer/polyhedron/linear_algebra.py +++ b/veerer/polyhedron/linear_algebra.py @@ -10,17 +10,19 @@ # # Copyright (C) 2023 Vincent Delecroix # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** diff --git a/veerer/polyhedron/linear_expression.py b/veerer/polyhedron/linear_expression.py index ae49cb5..f18dc48 100644 --- a/veerer/polyhedron/linear_expression.py +++ b/veerer/polyhedron/linear_expression.py @@ -9,17 +9,19 @@ # # Copyright (C) 2023 Vincent Delecroix # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** from ..env import require_package, sage, ppl diff --git a/veerer/triangulation.py b/veerer/triangulation.py index f15cf3b..96a4a5d 100644 --- a/veerer/triangulation.py +++ b/veerer/triangulation.py @@ -8,17 +8,19 @@ # 2018-2023 Vincent Delecroix # 2018 Saul Schleimer # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** import numbers @@ -119,13 +121,13 @@ def face_edge_perms_init(data): # a coding for any cell decomposition (with possibly folded edges). # flipping here still makes sense # -# + + + _ + +# + + + _ # \b a/ \ _/ / # \ e / \ e __/ / -# +-----------+ ---------> + __/ + +# +-----------+ ---------> + __/ # / \ / __/ \ # /c d\ /__/ \ -# + + +/ + +# + + +/ # # and we have operations that consist in removing/adding edges. # For that purpose, it would be convenient to allow partial diff --git a/veerer/veering_quadrangulation.py b/veerer/veering_quadrangulation.py index 5ae5961..dfaddfb 100644 --- a/veerer/veering_quadrangulation.py +++ b/veerer/veering_quadrangulation.py @@ -23,17 +23,19 @@ # # Copyright (C) 2020-2021 Vincent Delecroix # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** import functools diff --git a/veerer/veering_triangulation.py b/veerer/veering_triangulation.py index 5c54cc8..1b7a068 100644 --- a/veerer/veering_triangulation.py +++ b/veerer/veering_triangulation.py @@ -12,17 +12,19 @@ # 2018-2023 Vincent Delecroix # 2018 Saul Schleimer # -# veerer is free software: you can redistribute it and/or modify it under the -# terms of the GNU General Public License version 3 as published by the Free -# Software Foundation. +# This program is free software; you can redistribute it and/or +# modify it under the terms of the GNU General Public License +# as published by the Free Software Foundation; either version 2 +# of the License, or (at your option) any later version. # -# veerer is distributed in the hope that it will be useful, +# This program is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of # MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the # GNU General Public License for more details. # # You should have received a copy of the GNU General Public License -# along with veerer. If not, see . +# along with this program; if not, write to the Free Software +# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. # **************************************************************************** import collections @@ -212,7 +214,7 @@ def __hash__(self): r""" TESTS:: - sage: from veerer import * + sage: from veerer import * sage: triangulations = [] sage: for cols in ["RRB", "RBR", "BRR", "BBR", "BRB", "RBB"]: @@ -748,7 +750,7 @@ def copy(self, mutable=None): False sage: T == S2 True - + TESTS:: sage: from veerer import VeeringTriangulation