Changeset 92a473 in git

Timestamp:

Sep 21, 2005, 9:13:10 AM (19 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

d83bbe1632a5e0ab0676e4581f6f2e91fae7b383

Parents:

8062aa63166d4d1d159c8cd2c00a2baf0be49271

Message:

*bricken: ring extraction


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

Files:

• kernel/Ideal.h (modified) (2 diffs)
• modules/openmathserver/polyd.py (modified) (1 diff)
• modules/openmathserver/singularom.py (modified) (1 diff)
• modules/openmathserver/singulartest.sing (modified) (2 diffs)
• modules/python/ideal_wrap.cc (modified) (4 diffs)
• modules/python/poly_wrap.cc (modified) (2 diffs)
• modules/python/ring_wrap.cc (modified) (2 diffs)
• modules/python/ring_wrap.h (modified) (2 diffs)

kernel/Ideal.h

@@ -1 +1 @@
 #ifndef IDEAL_CPP_HEADER
 #define IDEAL_CPP_HEADER
-//$Id: Ideal.h,v 1.5 2005-09-20 07:18:18 bricken Exp $
+//$Id: Ideal.h,v 1.6 2005-09-21 07:13:10 bricken Exp $
 #include <vector>
 #include "Poly.h"
@@ -26 +26 @@
    {
    
+ }
+ ring getRing() const{
+  //FIXME: is a hack
+  if (size()>0){
+    return storage[0].getRing();
+  }
+  else
+  return (ring) NULL;
  }
  poly_type& operator[] (int n){

modules/openmathserver/polyd.py

@@ -10 +10 @@
 groebnersym=OMSymbol("groebner",content)
 DMPsym=OMSymbol("DMP",content)
+DMPLsym=OMSymbol("DMPL",content)
 SDMPsym=OMSymbol("SDMP",content)
 termsym=OMSymbol("term", content)
+dpsym=OMSymbol("graded_reverse_lexicographic", content)
+lpsym=OMSymbol("lexicographic", content)
+
 poly_ring_dsym=OMSymbol("poly_ring_d",content)
 def groebnerfunc(context, *args):

modules/openmathserver/singularom.py

@@ -2 +2 @@
 from interpreter import *
 from objects import *
-from polyd import DMPsym, SDMPsym, termsym
+from polyd import DMPsym, SDMPsym, termsym, lpsym,dpsym,poly_ring_dsym, DMPLsym
+from fieldname1 import Qsym as Rationals
 singular=singular_globals_proxy()
+class SingularException(Exception):
+  pass
+
 def encodePoly(p):
   terms=[encodeTerm(t) for t in p]
   return OMApply(SDMPsym,terms)
 
+def encodePolyWithRing(p):
+  """FIXME: just encodes currentRing"""
+  p=encodePoly(p)
+  r=encodeRing(ring())
+  return OMApply(DMPsym,[r,p])
+  
+  
+orderingTable={
+  "lp": lpsym,
+  "dp": dpsym
+}
+def encodeOrdering(r):
+  rl=singular.ringlist(r)
+  return orderingTable[rl[2][0][0]]
+
+def encodeField(r):
+  char=singular.char(r)
+  if char==0 and singular.npars(r)==0:
+    return Rationals
+  else:
+    raise SingularException("unknown field to encode")
+
+def encodeIdeal(i):
+  """FIXME: uses only currentRing"""
+  r=encodeRing(ring())
+  return OMApply(DMPLsym,[r]+[encodePoly(p) for p in i])
+def encodeRing(r):
+    nv=singular.nvars(r)
+    f=encodeField(r)
+    return OMApply(poly_ring_dsym,[f,OMint(nv)])   
+  
 def encodeTerm(t):
   """FIXME: ugly because it uses slow interpreter interface"""

modules/openmathserver/singulartest.sing

@@ -1 +1 @@
 ring r=0,(x,y,z),lp;
 poly f=37x3y+x2yz;
+ideal i=f,f*f,f*f*f;
 LIB("python_module.so");
 Python_module::python("from interpreter import singular_globals_proxy
@@ -6 +7 @@
 from context import *
 inter=singular_globals_proxy()
+inter.r.set()
+inter.__getattr__('print')(inter.f.ring())
 doc= encodePoly(inter.f)
-#print doc
-#print doc.children
 context=Context()
+output=context.XMLEncodeObject(doc)
+print output
+doc=encodeOrdering(singular.r)
+output=context.XMLEncodeObject(doc)
+print output
+doc=encodeRing(singular.r)
+output=context.XMLEncodeObject(doc)
+print output
+doc=encodePolyWithRing(singular.f)
+output=context.XMLEncodeObject(doc)
+print output
+doc=encodeIdeal(singular.i)
+output=context.XMLEncodeObject(doc)
+print output
+print 'semi encoding groebner basis'
+doc=encodeIdeal(singular.groebner(singular.i))
 output=context.XMLEncodeObject(doc)
 print output

modules/python/ideal_wrap.cc

@@ -1 @@
-//$Id: ideal_wrap.cc,v 1.5 2005-09-20 08:39:44 bricken Exp $
+//$Id: ideal_wrap.cc,v 1.6 2005-09-21 07:12:48 bricken Exp $
 #include <poly_wrap.h>
 #include <boost/python.hpp>
@@ -5 +5 @@
 #include "Poly.h"
 #include "Ideal.h"
+#include "ring_wrap.h"
 #include <boost/python/suite/indexing/vector_indexing_suite.hpp>
 using boost::python::self;
@@ -27 +28 @@
   return res;
 }
+static Ring Ideal_get_Ring(const Ideal & p){
+  return p.getRing();
+}
 
 
@@ -33 +37 @@
    boost::python::class_<Ideal>("ideal")
      .def("__str__", Ideal_as_str)
+     .def("ring",Ideal_get_Ring)
      .def(boost::python::init <>())
      .def(vector_indexing_suite<Ideal >());

modules/python/poly_wrap.cc

@@ -3 +3 @@
 #include "mod2.h"
 #include "Poly.h"
+#include "ring_wrap.h"
 using boost::python::self;
 boost::python::str Poly_as_str(const Poly& p)
@@ -12 +13 @@
   return boost::python::str(out,strlen(out));
 }
+static Ring Poly_get_Ring(const Poly & p){
+  return p.getRing();
+}
 void export_poly()
 {
    boost::python::class_<Poly>("polynomial")
+    .def("ring",Poly_get_Ring)
     .def(boost::python::init <int>())
     .def(boost::python::init <Poly>())

modules/python/ring_wrap.cc

@@ -1 @@
-//$Id: ring_wrap.cc,v 1.2 2005-09-20 08:39:44 bricken Exp $
+//$Id: ring_wrap.cc,v 1.3 2005-09-21 07:12:48 bricken Exp $
 #include <poly_wrap.h>
 #include <boost/python.hpp>
@@ -15 +15 @@
 boost::python::class_<Ring>("ring")
      .def("__str__", Ring_as_str)
+     .def("set", &Ring::set)
      .def(boost::python::init <>());
 

modules/python/ring_wrap.h

@@ -1 @@
-//$Id: ring_wrap.h,v 1.4 2005-09-20 12:22:59 bricken Exp $
+//$Id: ring_wrap.h,v 1.5 2005-09-21 07:12:48 bricken Exp $
 #ifndef RING_WRAP_HEADER
 #define RING_WRAP_HEADER
+#include "ring.h"
 class Ring{
   public:
@@ -16 +17 @@
         --(pimpl->ref);
     }
+    void set(){
+      rChangeCurrRing(pimpl);
+    }
 };
 void export_ring();