Rename Domain.project_out() into Domain.project()

diff --git a/examples/diamond.py b/examples/diamond.py
index 1681054..5d0de4e 100755 (executable)
--- a/examples/diamond.py
+++ b/examples/diamond.py
@@ -5,4 +5,4 @@ from pypol import *
 x, y = symbols('x y')
 diam = Ge(y, x - 1) & Le(y, x + 1) & Ge(y, -x - 1) & Le(y, -x + 1)
 print('diamond:', diam)
 x, y = symbols('x y')
 diam = Ge(y, x - 1) & Le(y, x + 1) & Ge(y, -x - 1) & Le(y, -x + 1)
 print('diamond:', diam)

-print('projected on x:', diam.project_out([y]))
+print('projected on x:', diam.project([y]))

diff --git a/examples/nsad2010.py b/examples/nsad2010.py
index 8194618..0a25279 100755 (executable)
--- a/examples/nsad2010.py
+++ b/examples/nsad2010.py
@@ -22,7 +22,7 @@ class Transformer:
         polyhedron = self.polyhedron
         for x, xprime, dx in zip(self.range_symbols, self.domain_symbols, delta_symbols):
             polyhedron &= Eq(dx, xprime - x)
         polyhedron = self.polyhedron
         for x, xprime, dx in zip(self.range_symbols, self.domain_symbols, delta_symbols):
             polyhedron &= Eq(dx, xprime - x)

-        polyhedron = polyhedron.project_out(self.symbols)
+        polyhedron = polyhedron.project(self.symbols)

         equalities, inequalities = [], []
         for equality in polyhedron.equalities:
             equality += (k-1) * equality.constant
         equalities, inequalities = [], []
         for equality in polyhedron.equalities:
             equality += (k-1) * equality.constant


@@ -31,10 +31,10 @@ class Transformer:
             inequality += (k-1) * inequality.constant
             inequalities.append(inequality)
         polyhedron = Polyhedron(equalities, inequalities) & Ge(k, 0)
             inequality += (k-1) * inequality.constant
             inequalities.append(inequality)
         polyhedron = Polyhedron(equalities, inequalities) & Ge(k, 0)

-        polyhedron = polyhedron.project_out([k])
+        polyhedron = polyhedron.project([k])

         for x, xprime, dx in zip(self.range_symbols, self.domain_symbols, delta_symbols):
             polyhedron &= Eq(dx, xprime - x)
         for x, xprime, dx in zip(self.range_symbols, self.domain_symbols, delta_symbols):
             polyhedron &= Eq(dx, xprime - x)

-        polyhedron = polyhedron.project_out(delta_symbols)
+        polyhedron = polyhedron.project(delta_symbols)

         return Transformer(polyhedron, self.range_symbols, self.domain_symbols)
 
 
         return Transformer(polyhedron, self.range_symbols, self.domain_symbols)
 
 

diff --git a/examples/squares.py b/examples/squares.py
index 0df8b4b..e622c27 100755 (executable)
--- a/examples/squares.py
+++ b/examples/squares.py
@@ -63,8 +63,8 @@ print()
 print('sq6:', sq6)
 print('sq6 simplified:', sq6.sample())
 print()
 print('sq6:', sq6)
 print('sq6 simplified:', sq6.sample())
 print()

-print(universe.project_out([x]))
-print('sq7 with out constraints involving y and a', sq7.project_out([a, z, x, y])) #drops dims that are passed
+print(universe.project([x]))
+print('sq7 with out constraints involving y and a', sq7.project([a, z, x, y])) #drops dims that are passed

 print()
 print('sq1 has {} parameters'.format(sq1.num_parameters()))
 print()
 print()
 print('sq1 has {} parameters'.format(sq1.num_parameters()))
 print()

diff --git a/pypol/domains.py b/pypol/domains.py
index a924b83..dd39220 100644 (file)
--- a/pypol/domains.py
+++ b/pypol/domains.py
@@ -152,7 +152,7 @@ class Domain:
         islbset = libisl.isl_set_polyhedral_hull(islset)
         return Polyhedron._fromislbasicset(islbset, self.symbols)
 
         islbset = libisl.isl_set_polyhedral_hull(islset)
         return Polyhedron._fromislbasicset(islbset, self.symbols)
 

-    def project_out(self, dims):
+    def project(self, dims):

         # use to remove certain variables
         islset = self._toislset(self.polyhedra, self.symbols)
         n = 0
         # use to remove certain variables
         islset = self._toislset(self.polyhedra, self.symbols)
         n = 0

diff --git a/pypol/tests/test_domains.py b/pypol/tests/test_domains.py
index 4d38075..a6f643c 100644 (file)
--- a/pypol/tests/test_domains.py
+++ b/pypol/tests/test_domains.py
@@ -60,7 +60,7 @@ class TestDomain(unittest.TestCase):
         self.assertFalse(self.empty == self.universe)
 
     def test_isdisjoint(self):
         self.assertFalse(self.empty == self.universe)
 
     def test_isdisjoint(self):

-        self.assertFalse(self.square1.isdisjoint(self.square2))        
+        self.assertFalse(self.square1.isdisjoint(self.square2))

         self.assertFalse(self.universe.isdisjoint(self.square1))
         self.assertTrue(self.square1.isdisjoint(self.square5))
         self.assertTrue(self.empty.isdisjoint(self.square1))
         self.assertFalse(self.universe.isdisjoint(self.square1))
         self.assertTrue(self.square1.isdisjoint(self.square5))
         self.assertTrue(self.empty.isdisjoint(self.square1))


@@ -76,7 +76,7 @@ class TestDomain(unittest.TestCase):
         self.assertFalse(self.square3 <= self.square4)
         self.assertTrue(self.empty <= self.square1)
         self.assertTrue(self.square1 <= self.universe)
         self.assertFalse(self.square3 <= self.square4)
         self.assertTrue(self.empty <= self.square1)
         self.assertTrue(self.square1 <= self.universe)

-        
+

     def test_lt(self):
         self.assertTrue(self.square4 < self.square3)
         self.assertFalse(self.square3 < self.square4)
     def test_lt(self):
         self.assertTrue(self.square4 < self.square3)
         self.assertFalse(self.square3 < self.square4)


@@ -93,11 +93,11 @@ class TestDomain(unittest.TestCase):
         self.assertEqual(self.universe.polyhedral_hull(), self.universe)
         self.assertEqual(self.empty.polyhedral_hull(), self.empty)
 
         self.assertEqual(self.universe.polyhedral_hull(), self.universe)
         self.assertEqual(self.empty.polyhedral_hull(), self.empty)
 

-    def test_project_out(self):
-        self.assertEqual(self.square1.project_out(symbols('x')), self.dropped)
-        self.assertEqual(self.square1.project_out(symbols('x y')), self.universe)
-        self.assertEqual(self.universe.project_out([]), self.universe)
-        self.assertEqual(self.empty.project_out([]), Empty)
+    def test_project(self):
+        self.assertEqual(self.square1.project(symbols('x')), self.dropped)
+        self.assertEqual(self.square1.project(symbols('x y')), self.universe)
+        self.assertEqual(self.universe.project([]), self.universe)
+        self.assertEqual(self.empty.project([]), Empty)

 
     def test_simplify(self):
         self.assertEqual(self.universe.simplify(), self.universe)
 
     def test_simplify(self):
         self.assertEqual(self.universe.simplify(), self.universe)


@@ -107,7 +107,7 @@ class TestDomain(unittest.TestCase):
         self.assertEqual(self.square6.sample(), self.sample)
         self.assertEqual(self.empty.sample(), Empty)
         self.assertEqual(self.universe.sample(), self.universe)
         self.assertEqual(self.square6.sample(), self.sample)
         self.assertEqual(self.empty.sample(), Empty)
         self.assertEqual(self.universe.sample(), self.universe)

-        
+

     def test_intersection(self):
         self.assertEqual(self.square1.intersection(self.square2), self.intersection)
 
     def test_intersection(self):
         self.assertEqual(self.square1.intersection(self.square2), self.intersection)
 


@@ -151,12 +151,12 @@ class TestDomain(unittest.TestCase):
         self.assertEqual(self.square1.lexmax(), self.lexmax)
         self.assertEqual(self.universe.lexmax(), self.universe)
         self.assertEqual(self.empty.lexmax(), Empty)
         self.assertEqual(self.square1.lexmax(), self.lexmax)
         self.assertEqual(self.universe.lexmax(), self.universe)
         self.assertEqual(self.empty.lexmax(), Empty)

-        
+

     def test_num_parameters(self):
         self.assertEqual(self.square1.num_parameters(), 2)
         self.assertEqual(self.empty.num_parameters(), 0)
         self.assertEqual(self.universe.num_parameters(), 0)
     def test_num_parameters(self):
         self.assertEqual(self.square1.num_parameters(), 2)
         self.assertEqual(self.empty.num_parameters(), 0)
         self.assertEqual(self.universe.num_parameters(), 0)

-        
+

     def test_involves_dims(self):
         self.assertTrue(self.square1.involves_dims(symbols('x y')))
         self.assertFalse(self.empty.involves_dims(symbols('x')))
     def test_involves_dims(self):
         self.assertTrue(self.square1.involves_dims(symbols('x y')))
         self.assertFalse(self.empty.involves_dims(symbols('x')))