Changeset a9d624 in git

Timestamp:

Sep 8, 2005, 2:47:18 PM (19 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

a171c0db5983b1b21803816bbc2059e6a2c2c01c

Parents:

d964f9729f190e72c24a8391d0e7b4ab964543a2

Message:

*bricken: converters


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

Files:

• kernel/Ideal.h (modified) (5 diffs)
• modules/python/ideal_wrap.cc (modified) (2 diffs)
• modules/python/interpretertester (modified) (2 diffs)
• modules/python/wrapper.h (modified) (5 diffs)

kernel/Ideal.h

@@ -1 +1 @@
 #ifndef IDEAL_CPP_HEADER
 #define IDEAL_CPP_HEADER
-//$Id: Ideal.h,v 1.1 2005-09-08 12:07:20 bricken Exp $
+//$Id: Ideal.h,v 1.2 2005-09-08 12:47:04 bricken Exp $
 #include "Poly.h"
+#include "ideals.h"
 //base for ideals as well for modules
 
@@ -43 +44 @@
    return storage.end();
  }
- size_type size(){
+ size_type size() const{
    return storage.size();
  }
@@ -61 +62 @@
    return insert(__pos,__first,__last);
  }
+
 };
 
@@ -68 +70 @@
   Ideal(){
   }
+  Ideal(ideal i, ring r){
+    for(int j=0;j<IDELEMS(i);j++){
+      storage.push_back(Poly(i->m[j],r));
+    }
+  }
   Ideal(iterator first, 
         iterator last,
@@ -73 +80 @@
     IdealBase<Poly>(first,last,__a){
   }
+ ideal as_ideal() const{
+   //no checks for rings
+   int s=size();
+   ideal result=idInit(s);
+   
+   for(int i=0;i<s;i++){
+     result->m[i]=storage[i].as_poly();
+   }
+   return result;
+ }
 };
 class Modul:

modules/python/ideal_wrap.cc

@@ -16 +16 @@
   int i;
   int s=p.size();
-  tojoin.append("[");
+  //tojoin.append("[");
   for(i=0;i<s;i++){
     tojoin.append(Poly_as_str(p[i]));
@@ -22 +22 @@
       tojoin.append(", ");
   }
-  tojoin.append("]");
+  //tojoin.append("]");
   str res=helper.join(tojoin);
   return res;

modules/python/interpretertester

@@ -39 +39 @@
   return(m);
 }
-python_module::python("from Singular import number,  polynomial, interpreter_id, get_idhdl,call_interpreter_method, i_arg_list, gen
+python_module::python("from Singular import number,  polynomial, interpreter_id, get_idhdl,call_interpreter_method, i_arg_list, gen, ideal
 
 from interpreter import global_functions
@@ -46 +46 @@
 x=polynomial('x')
 y=polynomial('y')
+i=ideal()
+i.append(x)
+i.append(x+y)
+print i
+print functions.groebner(i);
 xy=x*y
 

modules/python/wrapper.h

@@ -1 @@
-//$Id: wrapper.h,v 1.25 2005-09-08 11:45:23 bricken Exp $
+//$Id: wrapper.h,v 1.26 2005-09-08 12:47:18 bricken Exp $
 #ifndef PYTHON_SINGULAR_WRAPPER_HEADER
 #define PYTHON_SINGULAR_WRAPPER_HEADER
@@ -18 +18 @@
 #include "Poly.h"
 #include "PowerSeries.h"
+#include "Ideal.h"
 #include "ideal_wrap.h"
 #include <factory.h>
@@ -72 +73 @@
     v->data=p.as_poly();
     v->rtyp=POLY_CMD;
+    internal_append(v);
+  }
+  void appendIdeal(const Ideal& p){
+    leftv v=initArg();
+    v->data=p.as_ideal();
+    v->rtyp=IDEAL_CMD;
     internal_append(v);
   }
@@ -147 +154 @@
    
     return to_python_value<Vector>()( Vector((poly) v->data, currRing));
+  case IDEAL_CMD:
+    return to_python_value<Ideal>()(Ideal((ideal) v->data, currRing));
   case  NUMBER_CMD:
   
@@ -211 +220 @@
     .def("append", &arg_list::appendArray)
     .def("append", &arg_list::appendNumber)
-   .def("append", &arg_list::appendint)
-   .def("append", &arg_list::appendVector);
+    .def("append", &arg_list::appendint)
+    .def("append", &arg_list::appendIdeal)
+    .def("append", &arg_list::appendVector);
   boost::python::class_<idhdl_wrap>("interpreter_id")
     .def("is_zero", &idhdl_wrap::is_zero)