[SCM] polybori: Polynomials over Boolean Rings branch, master, updated. upstream/0.8.2-42-g9b048fc

[Alexander Dreyer]

The following commit has been merged in the master branch:
commit 4b1accb4d143953b13080935c61635c53d19de30
Author: Alexander Dreyer <adreyer at gmx.de>
Date:   Fri Jan 4 23:42:23 2013 +0100

    Upstream fix for PolyGUI from commits 72e6bf8dc and e3dd38cfb2

diff --git a/debian/patches/0005_PolyGUI.patch b/debian/patches/0005_PolyGUI.patch
new file mode 100644
index 0000000..bc2aa0a
--- /dev/null
+++ b/debian/patches/0005_PolyGUI.patch
@@ -0,0 +1,46 @@
+Description: Upstream patch for broken PolyGUI
+ Running PolyGui was broken, but this was fixed upstream in the development
+ branch.
+ .
+ polybori (0.8.2-1~exp1) unstable; urgency=low
+ .
+   * Updating to recent Debian standards
+Author: Alexander Dreyer <adreyer at gmx.de>
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: upstream, http://bitbucket.org/brickenstein/polybori/commits/e3dd38cfb2 http://bitbucket.org/brickenstein/polybori/commits/72e6bf8d
+Forwarded: not-needed
+Last-Update: 2013-01-04
+
+--- polybori-0.8.2.orig/gui/PolyGUI
++++ polybori-0.8.2/gui/PolyGUI
+@@ -528,18 +528,21 @@ class BoxLayout(QtGui.QWidget):
+             options.ordering='block_' + options.ordering
+         #mydata=load_file('/p/sys/IndAlg/share/data/uf20_45.py')
+         mydata=load_file(self.filename)
+-        I=mydata.ideal
++
++        ring = mydata.r.clone(ordering=getattr(OrderCode, options.ordering))
++        I = [ring(p) for p in mydata.ideal] 
+         t=time()
+         tc=clock()
+-       
+-        change_ordering(getattr(OrderCode, options.ordering))
++
++
+         if match("block",options.ordering):
+             block_starts=parse_blocks(options.blocks,mydata)
+             block_starts.sort()
+             for s in block_starts:
+                 append_ring_block(s)
++
+         if not options.auto:
+-            I = groebner_basis(I, **dict([(k,getattr(options,k)) for k in dir(options) if k in groebner_basis.options]))
++            I = groebner_basis(I, **dict([(k,getattr(options,k)) for k in dir(options)]))
+         else:
+             I= groebner_basis(I,prot=options.prot)
+ 
diff --git a/debian/patches/series b/debian/patches/series
index 9cec0a3..32873e4 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@
 0002-customize-library-version.patch
 0003_support_pkgconfig.patch
 0004_SConstruct.patch
+0005_PolyGUI.patch
diff --git a/gui/PolyGUI b/gui/PolyGUI
index e9d1b43..0b5864a 100755
--- a/gui/PolyGUI
+++ b/gui/PolyGUI
@@ -528,18 +528,21 @@ class BoxLayout(QtGui.QWidget):
             options.ordering='block_' + options.ordering
         #mydata=load_file('/p/sys/IndAlg/share/data/uf20_45.py')
         mydata=load_file(self.filename)
-        I=mydata.ideal
+
+        ring = mydata.r.clone(ordering=getattr(OrderCode, options.ordering))
+        I = [ring(p) for p in mydata.ideal] 
         t=time()
         tc=clock()
-       
-        change_ordering(getattr(OrderCode, options.ordering))
+
+
         if match("block",options.ordering):
             block_starts=parse_blocks(options.blocks,mydata)
             block_starts.sort()
             for s in block_starts:
                 append_ring_block(s)
+
         if not options.auto:
-            I = groebner_basis(I, **dict([(k,getattr(options,k)) for k in dir(options) if k in groebner_basis.options]))
+            I = groebner_basis(I, **dict([(k,getattr(options,k)) for k in dir(options)]))
         else:
             I= groebner_basis(I,prot=options.prot)
 

-- 
polybori: Polynomials over Boolean Rings