Changeset 4e2486 in git

Timestamp:

Aug 17, 2005, 11:14:34 AM (19 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

650d1417bb87b3339aa5ce123bb3ca01e61f181f

Parents:

6bfb0efc1cc28f45f85a083258997bf49484fa3b

Message:

*bricken: more work on vectors


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

Files:

• kernel/Poly.h (modified) (7 diffs)
• modules/python/polytester (modified) (1 diff)
• modules/python/wrapper.h (modified) (4 diffs)

kernel/Poly.h

@@ -1 @@
-//$Id: Poly.h,v 1.11 2005-08-17 08:34:44 bricken Exp $
+//$Id: Poly.h,v 1.12 2005-08-17 09:14:34 bricken Exp $
 
 
@@ -26 +26 @@
   friend class PolyBase<POLY_VARIANT_RING>;
   friend class PolyBase<POLY_VARIANT_MODUL>;
+  friend class Poly;
   //friend class Number;
  protected:
@@ -329 +330 @@
 template <poly_variant variant> class PolyBase;
 template <poly_variant v> inline PolyBase<v> operator+(const PolyBase<v>& p1, const PolyBase<v>& p2);
-template <poly_variant v> inline PolyBase<v> operator*(const PolyBase<v>& p1, const PolyBase<v>& p2);
-template <poly_variant v>inline PolyBase<v> operator*(const PolyBase<v>& p1, const Number& n);
+//template <poly_variant v> inline PolyBase<v> operator*(const PolyBase<v>& p1, const PolyBase<v>& p2);
+//template <poly_variant v>inline PolyBase<v> operator*(const PolyBase<v>& p1, const Number& n);
 template<poly_variant variant> class PolyBase{
  
@@ -420 +421 @@
   //  friend inline template PolyBase<poly_variant variant> operator+(const PolyBase<v>& p1, const PolyBase<v>& p2);
   friend PolyBase<variant> operator+<>(const PolyBase<variant>& p1, const PolyBase<variant>& p2);
-  friend PolyBase<variant> operator*<>(const PolyBase<variant>& p1, const PolyBase<variant>& p2);
-  friend PolyBase<variant> operator*<>(const PolyBase<variant>& p1, const Number& p2);
+  //friend PolyBase<variant> operator*<>(const PolyBase<variant>& p1, const PolyBase<variant>& p2);
+  //friend PolyBase<variant> operator*<>(const PolyBase<variant>& p1, const Number& p2);
 };
 
 class Poly: public PolyBase<POLY_VARIANT_RING>{
+ 
  public:
+   typedef PolyInputIterator<Poly> iterator;
   Poly(ring r=currRing):PolyBase<POLY_VARIANT_RING> ((poly)NULL,r,0){
   }
@@ -439 +442 @@
   Poly(const Number& n):PolyBase<POLY_VARIANT_RING>(*(new PolyImpl(n))){
     
+  }
+  Poly(poly p, ring r):PolyBase<POLY_VARIANT_RING>(p,r){
+    
+  }
+  Poly(poly p, ring r, int):PolyBase<POLY_VARIANT_RING>(p,r,0){
   }
   Poly(std::vector<int> v, ring r=currRing):PolyBase<POLY_VARIANT_RING>(*(new PolyImpl((poly) NULL,r))){
@@ -465 +473 @@
     return *this;
   }
+  PolyInputIterator<Poly> begin(){
+    return PolyInputIterator<Poly>(ptr->p,ptr->r);
+  }
+  PolyInputIterator<Poly> end(){
+    return PolyInputIterator<Poly>(NULL, ptr->r);
+  }
 };
 void foo(Poly p, Number n){
@@ -475 +489 @@
     return(PolyBase<v>(*res));
 }
-template <poly_variant v> inline PolyBase<v> operator*(const PolyBase<v>& p1, const PolyBase<v>& p2){
+/*template <poly_variant v> inline PolyBase<v> operator*(const PolyBase<v>& p1, const PolyBase<v>& p2){
     PolyImpl* res=new PolyImpl(*p1.ptr);
     *res *= *p2.ptr;
     return(PolyBase<v> (*res));
-}
-template <poly_variant v>inline PolyBase<v> operator*(const PolyBase<v>& p1, const Number& n){
-    PolyImpl* res=new PolyImpl(*p1.ptr);
-    *res *= n;
-    return(PolyBase<v>(*res));
-}
+    }*/
+inline PolyBase<POLY_VARIANT_MODUL> operator*(const PolyBase<POLY_VARIANT_MODUL>& p1, const Number& n){
+  PolyBase<POLY_VARIANT_MODUL> erg(p1);
+  erg*=n;
+  return erg;
+}
+Poly operator*(const Poly& p, const Poly& p2){
+  Poly erg=p;
+  erg*=p2;
+  return erg;
+}
+
 Poly operator+(const Poly& p1, const Poly& p2){
   Poly f(p1);

modules/python/polytester

@@ -18 +18 @@
 print z+xy
 print z,xy
-print xy+xy*xy
+#print xy+xy*xy
 print xy
 for t in (xy*xy+xy+polynomial(1)):

modules/python/wrapper.h

@@ -1 @@
-//$Id: wrapper.h,v 1.4 2005-08-17 06:33:04 bricken Exp $
+//$Id: wrapper.h,v 1.5 2005-08-17 09:14:21 bricken Exp $
 #ifndef PYTHON_SINGULAR_WRAPPER_HEADER
 #define PYTHON_SINGULAR_WRAPPER_HEADER
@@ -22 +22 @@
 }
 
-static boost::python::object Poly_as_str(Poly p)
+static boost::python::object Poly_as_str(Poly& p)
 {
   using boost::python::str;
@@ -30 +30 @@
   return boost::python::str(out,strlen(out));
 }
+
 
 BOOST_PYTHON_MODULE(Singular){
@@ -83 +84 @@
     .def(self*=Number())
     .def(self*self);
+    boost::python::class_<PolyBase<POLY_VARIANT_MODUL> >("vector")
+    
+    .def(boost::python::init <>())
+    
+    
+    .def("__str__", Poly_as_str)
+    .def("__iter__", boost::python::iterator<PolyBase<POLY_VARIANT_MODUL> >())
+    //read monomials (only) from string
+    //.def(boost::python::init <const char* >())
+    
+      //.def("__str__", as_str)
+      //.def(-self)
+
+    .def(self+=self)
+      //    .def(self-=self)
+      //.def(self/=self)
+      //.def(self==self)
+    .def(self+self)
+    .def(self*=Number())
+      .def(self*Number());
+      //.def(self+Number())
+      //.def(self+=Number())
+      //.def(self*=Number());
+
   //boost::python::class_<TermReference>("termreference");
     //.def(self/self)