Changeset 3fcc98e in git

Timestamp:

Jan 31, 2020, 10:23:58 AM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')

Children:

ef6df21e3783870d5dd988a568b01c19e2ccbbb5

Parents:

a17747d8c42415aaf1eace9c5b94db3a73b73dd1

Message:

towards python3

Location:

Singular/dyn_modules/python

Files:

• cart.py (modified) (1 diff)
• perf.py (modified) (1 diff)
• symm.py (modified) (7 diffs)
• util.py (modified) (1 diff)

Singular/dyn_modules/python/cart.py

@@ -20 +20 @@
 def cartn(sequence, n):
   tocombine=list(itertools.repeat(sequence,n))
-  return itertools.imap(tuple,xcombine(*tocombine))
+  return list(map(tuple,xcombine(*tocombine)))
 
 if __name__=='__main__':
   for i in cartn([1,2,3],4):
-    print i
+    print(i)

Singular/dyn_modules/python/perf.py

@@ -2 +2 @@
 n=number(1);
 s=number(0)
-for i in xrange(1000000):
+for i in range(1000000):
         s=s+n
-print s
+print(s)

Singular/dyn_modules/python/symm.py

@@ -1 +1 @@
 from probstat import Cartesian
-from itertools import repeat,imap, ifilter
+from itertools import repeat
 from util import EquivalenceRelation
 from interpreter import *
@@ -28 +28 @@
 
 colors=3
-value_range=[modPNumber(i,colors) for i in xrange(colors)]
+value_range=[modPNumber(i,colors) for i in range(colors)]
 
 wrel=EquivalenceRelation()
@@ -34 +34 @@
   wrel[i]=-i
 weights_canonical_to_index=dict((weight,i+1) \
-    for (i,weight) in enumerate(ifilter( \
+    for (i,weight) in enumerate(filter( \
         wrel.isCanonical,value_range)))
 wtrans=dict((weight,weights_canonical_to_index[wrel.canonical(weight)]) for weight in \
@@ -42 +42 @@
 
 def constr_variations():
-  return imap(tuple,Cartesian(list(repeat(value_range,6))))
+  return list(map(tuple,Cartesian(list(repeat(value_range,6)))))
 relation=EquivalenceRelation()
 for (a,b,c,d,e,f) in constr_variations():
@@ -48 +48 @@
   relation[(a,b,c,d,e,f)]=(a,-d,-e,-b,-c,-f)
 canonical_to_index=dict((symbol,weights+i+1) for (i,symbol) in \
-    enumerate(ifilter( \
+    enumerate(filter( \
        relation.isCanonical,constr_variations())))
 vartrans=dict((symbol,canonical_to_index[relation.canonical(symbol)]) for symbol in \
@@ -63 +63 @@
 r=create_ring(char=0,nvars=weights+symbols)
 r.set()
-print r
+print(r)
 myideal=Ideal()
 def polysum(l):
@@ -90 +90 @@
 back_table_joint=dict(back_table_v)
 back_table_joint.update(back_table_w)
-print "back", back_table_joint
-print "original length",len(myideal)
-print "now calculating"
+print(("back", back_table_joint))
+print(("original length",len(myideal)))
+print("now calculating")
 myideal=singular.simplify(myideal,4)
-print "simplified", len(myideal)
+print(("simplified", len(myideal)))
 gb=singular.slimgb(myideal)
-print gb
-print len(gb), "GB elements"
+print(gb)
+print((len(gb), "GB elements"))

Singular/dyn_modules/python/util.py

@@ -5 +5 @@
 def create_ring(char=0, nvars=1, varNames=None, ordering="dp", degvec=None, register=None):
   if not varNames:
-    varNames=["x("+str(i)+")" for i in xrange(1,nvars+1)]
+    varNames=["x("+str(i)+")" for i in range(1,nvars+1)]
   else:
     nvars=len(varNames)
   if not degvec:
     degvec=IntVector()
-    for i in xrange(0,nvars):
+    for i in range(0,nvars):
       degvec.append(1)
   modulweights=IntVector()