fix spelling and some more error fixes, increment version

Author: ComboProblem

pplite/__init__.py

@@ -10,7 +10,7 @@
 - Acadia Larsen (2024): initial version.
 """
 
-__version__ = "0.0.51"
+__version__ = "0.0.52"
 
 from .linear_algebra import (
         Variable, Linear_Expression, Affine_Expression

pplite/generators.pyx

@@ -329,6 +329,12 @@ cdef class PPliteGenerator(object):
         n = self.thisptr.coeff(vv[0])
         return FLINT_Integer_to_Python(n)
 
+    # def coefficients(self):
+    #     """
+    #     Returns a list of coefficients for a given generator.
+    #     """
+    #     return [self.coefficient(v) for v in range(self.space_dimension())]
+
     def divisor(self):
         """
         TESTS:
@@ -344,15 +350,15 @@ cdef class PPliteGenerator(object):
         n = self.thisptr.divisor()
         return FLINT_Integer_to_Python(n)
 
-    def space_dimision(self):
+    def space_dimension(self):
         """
         TESTS:
         >>> from pplite import Variable, Linear_Expression, Affine_Expression, PPliteGenerator
         >>> x = Variable(0)
         >>> y = Variable(1)
         >>> e = 2*x + 3*y
         >>> g = PPliteGenerator('point', e, 7)
-        >>> g.space_dimision()
+        >>> g.space_dimension()
         2
         """
         return self.thisptr.space_dim()

pplite/linear_algebra.pyx

@@ -1034,7 +1034,7 @@ cdef class Affine_Expression(object):
     r"""
     Wrapper for PPLite's ``Affine_Expr`` class.
 
-    Note, this behaves analgolously to ppl's ``Linear_Expression`` class. 
+    Note, this behaves analogously to ppl's ``Linear_Expression`` class. 
 
     Examples:
 

pplite/polyhedron.pyx

@@ -156,7 +156,6 @@ cdef class NNC_Polyhedron(object):
                 d = d_cons
             dd = d
             ss =  string_to_Spec_Elem("universe")
-            
             tt = string_to_Topol("nnc")
             self.thisptr = new Poly(dd, ss, tt)
             for c in cons:
@@ -289,7 +288,7 @@ cdef class NNC_Polyhedron(object):
     def topology(self):
         pass
 
-    def space_dim(self):
+    def space_dimension(self):
         return self.thisptr.space_dim()
 
     def affine_dim(self):
@@ -325,8 +324,6 @@ cdef class NNC_Polyhedron(object):
         except TypeError:
             return self._relation_with_g(gen_or_constraint)  # failure here will raise the right type error for the general method. 
 
-
-
     def min(self, affine_expr, value, included_pointer, gen_object):
         cdef Affine_Expr ae
         cdef FLINT_Rational val
@@ -484,7 +481,7 @@ cdef class NNC_Polyhedron(object):
         >>> P_2.add_constraint(A >= 0)
         >>> P_2.is_necessarily_closed()
         False
-        >>> P_2.space_dim()
+        >>> P_2.space_dimension()
         1
         >>> P_2.equals(P)
         True
@@ -657,6 +654,19 @@ cdef class NNC_Polyhedron(object):
     def minimize(self):
         self.thisptr[0].minimize()
 
+    def add_space_dimensions(self, dim_to_add, projection):
+        cdef cppbool project
+        if projection:
+            project = True
+        else:
+            project = False
+        cdef dim_type m
+        if isinstance(dim_to_add, int):
+            m = dim_to_add
+            self.thisptr[0].add_space_dims(m, project)
+        else:
+            raise TypeError("dim_to_add needs to be an ``int``.")
+
 #####################################
 ### Poly_Con_Rel and Poly_Gen_Rel ###
 #####################################
@@ -668,7 +678,21 @@ cdef class Polyhedron_Constraint_Rel(object):
         self.thisptr = NULL
     def __dealloc__(self):
         del self.thisptr
-
+    def __init__(self):
+        pass
+    def nothing(self):
+        pass
+    def is_disjoint(self):
+        pass
+    def strictly_intersects(self):
+        pass
+    def is_included(self):
+        pass
+    def saturates(self):
+        pass
+    def implies(self, other):
+        pass
+        
 cdef class Polyhedron_Generator_Rel(object):
     def __cinit__(self):
         self.thisptr = NULL

setup.py

@@ -3,8 +3,8 @@
 import os
 import sys
 
-from setuptools import setup, Command
-from setuptools.extension import Extension
+from setuptools import setup, Command, Extension
+# from setuptools.extension import Extension
 
 # NOTE: setuptools build_ext does not work properly with Cython code
 from distutils.command.build_ext import build_ext as _build_ext
@@ -44,37 +44,37 @@ def run(self):
 
         _build_ext.run(self)
 
-class TestCommand(Command):
-    user_options = []
+# class TestCommand(Command):
+#     user_options = []
 
-    def initialize_options(self):
-        pass
+#     def initialize_options(self):
+#         pass
 
-    def finalize_options(self):
-        pass
+#     def finalize_options(self):
+#         pass
 
-    def run(self):
-        import subprocess, os, tempfile, shutil
+#     def run(self):
+#         import subprocess, os, tempfile, shutil
 
-        old_path = os.getcwd()
-        tempdir_path = tempfile.mkdtemp()
-        try:
-            shutil.copytree('./tests', tempdir_path, dirs_exist_ok=True)
-            os.chdir(tempdir_path)
+#         old_path = os.getcwd()
+#         tempdir_path = tempfile.mkdtemp()
+#         try:
+#             shutil.copytree('./tests', tempdir_path, dirs_exist_ok=True)
+#             os.chdir(tempdir_path)
 
-            if subprocess.call([sys.executable, 'runtests.py']):
-                raise SystemExit("Doctest failures")
+#             if subprocess.call([sys.executable, 'runtests.py']):
+#                 raise SystemExit("Doctest failures")
 
-            if subprocess.call([sys.executable, 'setup.py', 'build_ext', '--inplace']) or \
-                    subprocess.call([sys.executable, '-c', "import testpplitepy; testpplitepy.test(); testpplitepy.example()"]):
-                raise SystemExit("Cython test 1 failure")
+#             if subprocess.call([sys.executable, 'setup.py', 'build_ext', '--inplace']) or \
+#                     subprocess.call([sys.executable, '-c', "import testpplitepy; testpplitepy.test(); testpplitepy.example()"]):
+#                 raise SystemExit("Cython test 1 failure")
 
-            if subprocess.call([sys.executable, 'setup2.py', 'build_ext', '--inplace']) or \
-                    subprocess.call([sys.executable, '-c', "import testpplitepy2; testpplitepy2.test(); testpplitepy2.example()"]):
-                raise SystemExit("Cython test 2 failure")
-        finally:
-            os.chdir(old_path)
-            shutil.rmtree(tempdir_path)
+#             if subprocess.call([sys.executable, 'setup2.py', 'build_ext', '--inplace']) or \
+#                     subprocess.call([sys.executable, '-c', "import testpplitepy2; testpplitepy2.test(); testpplitepy2.example()"]):
+#                 raise SystemExit("Cython test 2 failure")
+#         finally:
+#             os.chdir(old_path)
+#             shutil.rmtree(tempdir_path)
 
 extensions = [
     Extension('pplite.integer_conversions', sources=['pplite/integer_conversions.pyx']),
@@ -85,8 +85,10 @@ def run(self):
     Extension('pplite.bounding_box', sources=['pplite/bounding_box.pyx']),
     Extension('pplite.polyhedron', sources=['pplite/polyhedron.pyx'])
     ]
-#finish writing setup at some point
+
 setup(
     ext_modules = extensions,
-    cmdclass = {'build_ext': build_ext, 'test': TestCommand},
+    cmdclass = {'build_ext': build_ext},
+    # long_description=open('README.rst').read(),
+    # long_description_content_type='text/markdown',
 )