Changeset 26f928 in git for modules/python

Timestamp:

Sep 9, 2005, 12:03:07 PM (19 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

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

Children:

a675fcb30922f056ecdcbd0e77cdd66c2c919faf

Parents:

4a8f253390029bf6c14db1e195cea6271e34a4d4

Message:

*bricken: writing global variables


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

Location:

modules/python

Files:

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

modules/python/README

@@ -75 +75 @@
 
 
+NEWS:
+*global_functions has be renamed to singular_globals_proxy
+the old name exists for short time for compat.
+
+*it is now possible to use the singular_globals_proxy for 
+    -reading global variables 
+    -writing global variables, if the var exists with the correct type in the interpreter
+    -calling global interpreter functions (not builtins, for example groebner but not std
 
 
@@ -83 +91 @@
 
 
-

modules/python/interpreter.py

@@ -21 +21 @@
                 raise AttributeError("Global variable "+name+" has unknown type")
             return res
-
+    def __setattr__(self,name,value):
+        id=get_idhdl(name)
+        if id.is_zero():
+            raise Expception
+        else:
+            id.write(value)
 #for compatibility the old name
 global_functions=singular_globals_proxy

modules/python/interpreter_support.cc

@@ -18 +18 @@
 using boost::python::numeric::array;
 using boost::python::extract;
+matrix matrixFromArray(const array& f){
+  object o=f.attr("shape");
+  
+  object o1=o[0];
+  
+  object o2=o[1];
+  int l1=extract<int>(o1);
+
+  
+  int l2=extract<int>(o2);
+  matrix m=mpNew(l1,l2);
+  for(int i=0;i<l1;i++){
+    for(int j=0;j<l2;j++){
+      Poly& x = boost::python::extract<Poly&>(f[boost::python::make_tuple(i,j)]);
+      poly p=x.as_poly();
+      MATELEM(m,i+1,j+1)=p;
+    }
+  }
+  return m;
+}
 class idhdl_wrap{
  public:
@@ -36 +56 @@
     Print("type:%d\n",id->typ);
   }
+  void writePoly(const Poly& p){
+    
+    if (id->typ==POLY_CMD){
+      p_Delete(&id->data.p, currRing);
+      id->data.p=p.as_poly();
+    }
+    
+  }
+  void writeIdeal(const Ideal& p){
+    if (id->typ==IDEAL_CMD){
+      id_Delete(&id->data.uideal, currRing);
+      
+      id->data.uideal=p.as_ideal();
+    }
+  }
+  void writeint(int p){
+    if (id->typ==INT_CMD){
+      id->data.i=p;
+    }
+  }
+  void writeNumber(const Number& p){
+     
+ if (id->typ==NUMBER_CMD){
+      n_Delete(&id->data.n, currRing);
+      id->data.n=p.as_number();
+    }
+  }
+  void writeVector(const Vector& p){
+       
+    if (id->typ==VECTOR_CMD){
+      p_Delete(&id->data.p, currRing);
+      id->data.p=p.as_poly();
+    }
+  }
+  void writeArray(const array& f){
+    if(id->typ=MATRIX_CMD){
+      matrix m=matrixFromArray(f);
+      id_Delete((ideal*) &id->data.umatrix,currRing);
+      id->data.umatrix;
+    }
+  }
 };
+
+
 class arg_list{
  public:
@@ -79 +142 @@
   }
   void appendArray(const array& f){
-    
-    
-    object o=f.attr("shape");
-  
-    object o1=o[0];
-    
-    object o2=o[1];
-    int l1=extract<int>(o1);
-   
-
-    int l2=extract<int>(o2);
-    matrix m=mpNew(l1,l2);
-    for(int i=0;i<l1;i++){
-      for(int j=0;j<l2;j++){
-        Poly& x = boost::python::extract<Poly&>(f[boost::python::make_tuple(i,j)]);
-        poly p=x.as_poly();
-        MATELEM(m,i+1,j+1)=p;
-      }
-    }
-    leftv v=initArg();
+    leftv v=initArg();
+    matrix m=matrixFromArray(f);
     v->data=m;
     v->rtyp=MATRIX_CMD;
@@ -236 +281 @@
     .def("is_proc", &idhdl_wrap::id_is_proc)
     .def("print_type", &idhdl_wrap::print_type)
+    .def("write", &idhdl_wrap::writePoly)
+    .def("write", &idhdl_wrap::writeArray)
+    .def("write", &idhdl_wrap::writeNumber)
+    .def("write", &idhdl_wrap::writeint)
+    .def("write", &idhdl_wrap::writeIdeal)
+    .def("write", &idhdl_wrap::writeVector)
     .def("__str__", idhdl_as_str);
   def("call_interpreter_method",call_interpreter_method);

modules/python/interpretertester

@@ -1 +1 @@
 ring r=0,(x,y,z),lp;
 int a=12345;
+poly f=0;
 timer=1;
 proc myprintmat(matrix m){
@@ -53 +54 @@
 print functions.groebner(i);
 xy=x*y
-
+functions.f=xy
 
 xye1=xy*gen(1)
@@ -67 +68 @@
 print functions.a
 ");
+print(f);
 $