Changeset 4a8f25 in git for modules/python

Timestamp:

Sep 9, 2005, 11:29:09 AM (19 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

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

Children:

26f92837efc1ad04c4c0b9a2be093e843a281a61

Parents:

51092d076fe254dc637ef1f5f80e5c2a1c01d4f6

Message:

*bricken: reading global singular variables


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

Location:

modules/python

Files:

• interpreter.py (modified) (1 diff)
• interpreter_support.cc (modified) (4 diffs)
• interpretertester (modified) (2 diffs)

modules/python/interpreter.py

@@ -1 +1 @@
 from Singular import *
-class global_functions(object):
+class singular_globals_proxy(object):
     def __getattr__(self,name):
         proc=get_idhdl(name)
         if proc.is_zero():
-            raise AttributeError("Global variable " + name + " not present in the Singular interpreter") 
-        def fun_wrapper(*args):
-            l=i_arg_list()
-            for a in args:
-                l.append(a)
-            proc=get_idhdl(name)
-            return call_interpreter_method(proc, l)
-        return fun_wrapper
+            raise AttributeError("Global variable " + name + " not present in the Singular interpreter")
+        if proc.is_proc():
+            def fun_wrapper(*args):
+                l=i_arg_list()
+                for a in args:
+                    l.append(a)
+                proc=get_idhdl(name)
+                if not proc.is_proc():
+                    proc.print_type()
+                    raise Exception
+                return call_interpreter_method(proc, l)
+            return fun_wrapper
+        else:
+            res=transfer_to_python(proc)
+            if res is None:
+                raise AttributeError("Global variable "+name+" has unknown type")
+            return res
+
+#for compatibility the old name
+global_functions=singular_globals_proxy

modules/python/interpreter_support.cc

@@ -30 +30 @@
     return id==NULL;
   }
+  bool id_is_proc(){
+    return (id->typ==PROC_CMD);
+  }
+  bool print_type(){
+    Print("type:%d\n",id->typ);
+  }
 };
 class arg_list{
@@ -116 +122 @@
   
 };
+static PyObject* buildPythonMatrix(matrix m, ring r){
+  using boost::python::numeric::array;
+  using boost::python::self;
+  using boost::python::make_tuple;
+  using boost::python::tuple;
+  using boost::python::object;
+  using boost::python::list;
+ 
+  list l;
+  
+  
+  for(int i=1;i<=MATROWS(m);i++){
+    list row;
+    for(int j=1;j<=MATCOLS(m);j++){
+      Poly ip(MATELEM(m,i,j),r);//copy it
+      row.append(ip);
+      //a[boost::python::make_tuple(i%2,i%5)]=ip;
+      //a[boost::python::make_tuple(i%2,i%5)]=ip;
+    }
+    l.append(row);
+  }
+  //FIXME: should call this only once
+  array::set_module_and_type("Numeric",
+                             "ArrayType"
+                             );
+  
+  return to_python_value<array>()(array(l));
+}
 PyObject* buildPyObjectFromLeftv(leftv v){
  
@@ -134 +168 @@
   case MATRIX_CMD:
     {
-      using boost::python::numeric::array;
-      using boost::python::self;
-      using boost::python::make_tuple;
-      using boost::python::tuple;
-      using boost::python::object;
-      using boost::python::list;
-      matrix m=(matrix) v->data;
-      list l;
-
-
-      for(int i=1;i<=MATROWS(m);i++){
-        list row;
-        for(int j=1;j<=MATCOLS(m);j++){
-          Poly ip(MATELEM(m,i,j),currRing);//copy it
-          row.append(ip);
-          //a[boost::python::make_tuple(i%2,i%5)]=ip;
-          //a[boost::python::make_tuple(i%2,i%5)]=ip;
-        }
-        l.append(row);
-      }
-      //FIXME: should call this only once
-      array::set_module_and_type("Numeric",
-                             "ArrayType"
-                             );
-
-      return to_python_value<array>()(array(l));
+      return buildPythonMatrix((matrix) v->data,currRing);
+    }
+  default:
+    Py_INCREF(Py_None);
+    return Py_None;
+  }
+}
+PyObject* buildPyObjectFromIdhdl(const idhdl_wrap&  id){
+  
+ 
+  switch (id.id->typ){
+  case INT_CMD:
+    return PyInt_FromLong((int)id.id->data.i);
+  case POLY_CMD:
+    
+    return to_python_value<Poly>()(Poly((poly) id.id->data.p, currRing));
+  case  VECTOR_CMD:
+   
+    return to_python_value<Vector>()( Vector((poly) id.id->data.p, currRing));
+  case IDEAL_CMD:
+    return to_python_value<Ideal>()(Ideal((ideal) id.id->data.uideal, currRing));
+  case  NUMBER_CMD:
+  
+    return to_python_value<Number>()(Number((number) id.id->data.n, currRing));
+  case MATRIX_CMD:
+    {
+      return buildPythonMatrix((matrix) id.id->data.umatrix,currRing);
     }
   default:
@@ -199 +234 @@
   boost::python::class_<idhdl_wrap>("interpreter_id")
     .def("is_zero", &idhdl_wrap::is_zero)
+    .def("is_proc", &idhdl_wrap::id_is_proc)
+    .def("print_type", &idhdl_wrap::print_type)
     .def("__str__", idhdl_as_str);
   def("call_interpreter_method",call_interpreter_method);
-}
-
-
+  def("transfer_to_python",buildPyObjectFromIdhdl);
+}
+
+

modules/python/interpretertester

@@ -1 +1 @@
 ring r=0,(x,y,z),lp;
+int a=12345;
 timer=1;
 proc myprintmat(matrix m){
@@ -64 +65 @@
 m=functions.testproc6(x,y)
 functions.myprintmat(m)
-
+print functions.a
 ");
 $