Minor improvements in class Vector

[linpy.git] / examples / nsad2010.py

diff --git a/examples/nsad2010.py b/examples/nsad2010.py
index 8194618..9359315 100755 (executable)
--- a/examples/nsad2010.py
+++ b/examples/nsad2010.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python3
 
 #!/usr/bin/env python3
 

-from pypol import *
+from linpy import *

 
 
 class Transformer:
 
 
 class Transformer:


@@ -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)