Changeset de9824 in git for modules

Timestamp:

Mar 8, 2006, 12:08:34 PM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

20284a2694d99a2af28ffd526fdda9fcbb02c2ee

Parents:

84b997a5443864cb92c365fa58b9f86932037a19

Message:

*bricken: wuah, new functions much easier


git-svn-id: file:///usr/local/Singular/svn/trunk@9001 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

modules/openmath

Files:

• cas/singular.py (modified) (2 diffs)
• singulartest.sing (modified) (2 diffs)

modules/openmath/cas/singular.py

@@ -114 +114 @@
 implementation.groebner=groebnerfunc
 
+def dmplQ(a):
+    if isinstance(a,OMA) and a.func==DMPLsym:
+        return True
+    else:
+        return False
+
+
+def input_convert(f):
+    def my2OM(a):
+        """FIXME: very dirty"""
+        global save_ring
+
+
+        if (dmplQ(a)):
+            dmpl=a
+            r=OM2ring(dmpl.args[0])
+            r.set()
+            i=OM2ideal_raw(dmpl)
+            safe_ring=r
+            return i
+        
+        return a
+            
+    def wrapper(*args):
+        return f(*[my2OM(a) for a in args])
+    
+    
+    wrapper.__name__=f.__name__
+    return wrapper
+    
+def output_convert(f):
+    def my2om(a):
+        """FIXME: very dirty"""
+        global save_ring
+
+        if isinstance(a,ideal):
+            return ideal2OM(a)
+        if (isinstance(a,list)):
+            return cd.list1.list2OM([my2om(a2) for a2 in a])
+        
+        return a
+            
+    def wrapper(*args):
+        return my2om(f(*args))
+    
+    
+    wrapper.__name__=f.__name__
+    return wrapper
+    
 def min_ass_func(dmpl):
     r=OM2ring(dmpl.args[0])
@@ -119 +168 @@
     i=OM2ideal_raw(dmpl)
     l=singular.minAssGTZ(i)
+    return cd.list1.OM2list([ideal2OM(i) for i in l])
+@input_convert
+def min_ass_func2(i):
+
+    l=singular.minAssGTZ(i)
     return cd.list1.list2OM([ideal2OM(i) for i in l])
-cd.primdec.implementation.minAss=min_ass_func
+    
+
+
+#cd.primdec.implementation.minAss=min_ass_func2
+cd.primdec.implementation.minAss=input_convert(output_convert(singular.minAssGTZ))
+
+cd.primdec.implementation.minAssGTZ=input_convert(output_convert(singular.minAssGTZ))
+
+cd.primdec.implementation.primdecGTZ=input_convert(output_convert(singular.primdecGTZ))
+
+
 optimize(poly2OM)
 optimize(term2OM)

modules/openmath/singulartest.sing

@@ -4 +4 @@
 LIB "primdec.lib";
 //LIB "poly.lib";
-
+ideal p1=x2,y;
+ideal p2=(x-1),(y-5)^2;
+ideal p3=(x)^2;
+ideal big=intersect(intersect(p1,p2),p3);
 ideal i2=cyclic(5);
 
@@ -34 +37 @@
 r=singular.r
 inter=singular_globals_proxy()
+
+
+
 easy=ideal2OM(singular.i)
 call=OMA(cd.primdec.implementation.minAss, [easy])
 print call
 print context.evaluate(call)
-
 r.set()
 
+
+easy=ideal2OM(singular.i)
+call=OMA(cd.primdec.implementation.primdecGTZ, [easy])
+print call
+print context.evaluate(call)
+r.set()
+
+
+easy=ideal2OM(singular.i)
+call=OMA(cd.primdec.implementation.minAssGTZ, [ideal2OM(singular.big)])
+print call
+print context.evaluate(call)
+r.set()
+
+easy=ideal2OM(singular.i)
+call=OMA(cd.primdec.implementation.primdecGTZ, [ideal2OM(singular.big)])
+print call
+print context.evaluate(call)
+r.set()
 cyc5=ideal2OM(singular.i2)
 ord=ordering2OM(singular.r)