Changeset c1e4cd in git

Timestamp:

Aug 17, 2005, 11:42:15 AM (19 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

82f499751785a3a81044266a491b4ef627535172

Parents:

650d1417bb87b3339aa5ce123bb3ca01e61f181f

Message:

*bricken: more template magic


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

Location:

kernel

Files:

• Number.h (modified) (2 diffs)
• Poly.h (modified) (9 diffs)

kernel/Number.h

@@ -10 +10 @@
   POLY_VARIANT_MODUL
 };
-template<poly_variant> class PolyBase;
-
+template<poly_variant,class> class PolyBase;
+class Poly;
 class Number{
   
@@ -30 +30 @@
   friend Number operator*(int n1, const Number& n2);
   friend bool operator==(int n1, const Number& n2);
-  friend class PolyBase<POLY_VARIANT_RING>;
-  friend class PolyBase<POLY_VARIANT_MODUL>;
+  friend class Poly;
+  friend class PolyBase<POLY_VARIANT_RING,Poly>;
+ 
   friend class PolyImpl;
   Number& operator=(const Number& n2){

kernel/Poly.h

@@ -1 @@
-//$Id: Poly.h,v 1.12 2005-08-17 09:14:34 bricken Exp $
+//$Id: Poly.h,v 1.13 2005-08-17 09:42:15 bricken Exp $
 
 
@@ -23 +23 @@
 //PolyImpl is a 08/15 poly wrapper
 //Poly wraps around PolyImpl with reference counting using boost
+
 class PolyImpl{
-  friend class PolyBase<POLY_VARIANT_RING>;
-  friend class PolyBase<POLY_VARIANT_MODUL>;
+  friend class PolyBase<POLY_VARIANT_RING,Poly>;
+  //friend class PolyBase<POLY_VARIANT_MODUL>;
   friend class Poly;
   //friend class Number;
@@ -328 +329 @@
 };
 
-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 PolyBase<v>& p2);
 //template <poly_variant v>inline PolyBase<v> operator*(const PolyBase<v>& p1, const Number& n);
-template<poly_variant variant> class PolyBase{
+template<poly_variant variant, class create_type_input> class PolyBase{
  
  public:
-  typedef PolyInputIterator<PolyBase> iterator;
+  typedef create_type_input create_type;
+  typedef PolyInputIterator<create_type> iterator;
   void copy_on_write(){
     if (!ptr.unique()){
@@ -362 +364 @@
   PolyBase(const PolyBase&p):ptr(p.ptr){
   }
-  typedef PolyBase<variant> create_type;
+
 
 
@@ -371 +373 @@
     return *this;
   }
-  PolyBase& operator*=(const PolyBase<POLY_VARIANT_RING> & p2){
+  PolyBase& operator*=(const Poly & p2){
     copy_on_write();
     *ptr *= *p2.ptr;
@@ -397 +399 @@
     }*/
 
-  PolyInputIterator<PolyBase> begin(){
-    return PolyInputIterator<PolyBase>(ptr->p,ptr->r);
-  }
-  PolyInputIterator<PolyBase> end(){
-    return PolyInputIterator<PolyBase>(NULL, ptr->r);
+  PolyInputIterator<create_type> begin(){
+    return PolyInputIterator<create_type>(ptr->p,ptr->r);
+  }
+  PolyInputIterator<create_type> end(){
+    return PolyInputIterator<create_type>(NULL, ptr->r);
   }
   ring getRing(){
@@ -420 +422 @@
   // friend inline Poly operator*(const Poly& p1, const Number& n);
   //  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 PolyBase<variant>& p2);
   //friend PolyBase<variant> operator*<>(const PolyBase<variant>& p1, const Number& p2);
 };
 
-class Poly: public PolyBase<POLY_VARIANT_RING>{
+class Poly: public PolyBase<POLY_VARIANT_RING, Poly>{
  
  public:
-   typedef PolyInputIterator<Poly> iterator;
-  Poly(ring r=currRing):PolyBase<POLY_VARIANT_RING> ((poly)NULL,r,0){
-  }
-  Poly(int n, ring r=currRing):PolyBase<POLY_VARIANT_RING>(*(new PolyImpl(n,r))){
-    
-  }
-  Poly(const char* c, ring r=currRing):PolyBase<POLY_VARIANT_RING>(c,r){
-
-  }
-  Poly(const PolyBase<POLY_VARIANT_RING>& p):PolyBase<POLY_VARIANT_RING>(p){
+
+  Poly(ring r=currRing):PolyBase<POLY_VARIANT_RING, Poly> ((poly)NULL,r,0){
+  }
+  Poly(int n, ring r=currRing):PolyBase<POLY_VARIANT_RING, Poly>(*(new PolyImpl(n,r))){
+    
+  }
+  Poly(const char* c, ring r=currRing):PolyBase<POLY_VARIANT_RING, Poly>(c,r){
+
+  }
+  Poly(const PolyBase<POLY_VARIANT_RING, Poly>& p):PolyBase<POLY_VARIANT_RING, Poly>(p){
   }
   
-  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))){
+  Poly(const Number& n):PolyBase<POLY_VARIANT_RING, Poly>(*(new PolyImpl(n))){
+    
+  }
+  Poly(poly p, ring r):PolyBase<POLY_VARIANT_RING, Poly>(p,r){
+    
+  }
+  Poly(poly p, ring r, int):PolyBase<POLY_VARIANT_RING, Poly>(p,r,0){
+  }
+  Poly(std::vector<int> v, ring r=currRing):PolyBase<POLY_VARIANT_RING, Poly>(*(new PolyImpl((poly) NULL,r))){
     unsigned int i;
     int s=v.size();
@@ -460 +462 @@
   /*  Poly& operator+=(const Number& n){
   Poly p2(n);
-  ((PolyBase<POLY_VARIANT_RING>&) (*this))+=p2;
+  ((PolyBase<POLY_VARIANT_RING, Poly>&) (*this))+=p2;
   return *this;
   }*/
   Poly& operator+=(const Poly& p ){
 
-    ((PolyBase<POLY_VARIANT_RING>&)*this)+=p;
-    return *this;
-  }
-  Poly& operator+=(const PolyBase<POLY_VARIANT_RING>& p ){
-
-    ((PolyBase<POLY_VARIANT_RING>&)*this)+=p;
-    return *this;
-  }
-  PolyInputIterator<Poly> begin(){
-    return PolyInputIterator<Poly>(ptr->p,ptr->r);
-  }
-  PolyInputIterator<Poly> end(){
-    return PolyInputIterator<Poly>(NULL, ptr->r);
-  }
+    ((PolyBase<POLY_VARIANT_RING, Poly>&)*this)+=p;
+    return *this;
+  }
+  Poly& operator+=(const PolyBase<POLY_VARIANT_RING, Poly>& p ){
+
+    ((PolyBase<POLY_VARIANT_RING, Poly>&)*this)+=p;
+    return *this;
+  }
+
 };
-void foo(Poly p, Number n){
-    p+=(Poly) n;
-  }
+
 //typedef Poly PolyBase<POLY_VARIANT_RING>::create_type;
-template <poly_variant v> inline PolyBase<v> operator+(const PolyBase<v>& p1, const PolyBase<v>& p2){
+/*template <poly_variant v, class c> inline PolyBase<v> operator+(const PolyBase<v,c>& p1, const PolyBase<v,c>& p2){
     PolyImpl* res=new PolyImpl(*p1.ptr);
     *res+=*p2.ptr;
-    return(PolyBase<v>(*res));
-}
+    return(PolyBase<v,c>(*res));
+    }*/
 /*template <poly_variant v> inline PolyBase<v> operator*(const PolyBase<v>& p1, const PolyBase<v>& p2){
     PolyImpl* res=new PolyImpl(*p1.ptr);
@@ -494 +489 @@
     return(PolyBase<v> (*res));
     }*/
-inline PolyBase<POLY_VARIANT_MODUL> operator*(const PolyBase<POLY_VARIANT_MODUL>& p1, const Number& n){
+/*template <class c> 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;