Changeset ecbe9f7 in git for kernel/Poly.h

Timestamp:

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

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'd08f5f0bb3329b8ca19f23b74cb1473686415c3a')

Children:

77ed9949773a942859e2d90eb3e135a1e0d09d7a

Parents:

89ccc16173d3e69a1de96f508bbe39a32a01ca75

Message:

*bricken: module, vector separated


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

File:

• kernel/Poly.h (modified) (12 diffs)

kernel/Poly.h

@@ -1 @@
-//$Id: Poly.h,v 1.7 2005-08-16 14:36:10 bricken Exp $
+//$Id: Poly.h,v 1.8 2005-08-17 06:34:16 bricken Exp $
 
 
@@ -24 +24 @@
 //Poly wraps around PolyImpl with reference counting using boost
 class PolyImpl{
-  friend class Poly;
+  friend class PolyBase<RING>;
+  friend class PolyBase<MODUL>;
   //friend class Number;
  protected:
@@ -324 +325 @@
 
 };
-class Poly{
+
+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 variant> class PolyBase{
  
  public:
-  typedef PolyInputIterator<Poly> iterator;
+  typedef PolyInputIterator<PolyBase> iterator;
   void copy_on_write(){
     if (!ptr.unique()){
@@ -342 +348 @@
   }
 
-  Poly(ring r=currRing):ptr(new PolyImpl((poly) NULL,r)){
-  }
-  Poly(int n, ring r=currRing):ptr(new PolyImpl(n,r)){
-    
-  }
-  Poly(const char* c, ring r=currRing):ptr(new PolyImpl((poly)NULL,r)){
+  PolyBase(ring r=currRing):ptr(new PolyImpl((poly) NULL,r)){
+  }
+  PolyBase(int n, ring r=currRing):ptr(new PolyImpl(n,r)){
+    
+  }
+  PolyBase(const char* c, ring r=currRing):ptr(new PolyImpl((poly)NULL,r)){
     //p_Read takes no const so do
     char* cp=(char*) omalloc((strlen(c)+1)*sizeof(char));
@@ -354 +360 @@
     omfree(cp);
   }
-  Poly(const Poly&p):ptr(p.ptr){
-  }
-  Poly(const Number& n):ptr(new PolyImpl(n)){
-    
-  }
-  Poly(std::vector<int> v, ring r=currRing):ptr(new PolyImpl((poly) NULL,r)){
+  PolyBase(const PolyBase&p):ptr(p.ptr){
+  }
+  PolyBase(const Number& n):ptr(new PolyImpl(n)){
+    
+  }
+  PolyBase(std::vector<int> v, ring r=currRing):ptr(new PolyImpl((poly) NULL,r)){
     unsigned int i;
     int s=v.size();
@@ -369 +375 @@
     ptr->p=p;
   }
-  Poly& operator+=(Poly p2){
+  PolyBase& operator+=(PolyBase p2){
     copy_on_write();
     *ptr += *p2.ptr;
@@ -375 +381 @@
     return *this;
   }
-  Poly& operator*=(Poly p2){
+  PolyBase& operator*=(PolyBase p2){
     copy_on_write();
     *ptr *= *p2.ptr;
@@ -381 +387 @@
     return *this;
   }
-  Poly& operator*=(Number n){
+  PolyBase& operator*=(Number n){
     copy_on_write();
     *ptr *=n;
@@ -392 +398 @@
      Print(StringAppendS(""));
      }*/
-  virtual ~Poly(){}
-  Poly(poly p, ring r):ptr(new PolyImpl(p,r)){
-  }
-  Poly(poly p, ring r,int):ptr(new PolyImpl(p,r,0)){
+  virtual ~PolyBase(){}
+  PolyBase(poly p, ring r):ptr(new PolyImpl(p,r)){
+  }
+  PolyBase(poly p, ring r,int):ptr(new PolyImpl(p,r,0)){
   }
   /*Poly(Poly& p){
@@ -401 +407 @@
     }*/
 
-  PolyInputIterator<Poly> begin(){
-    return PolyInputIterator<Poly>(ptr->p,ptr->r);
-  }
-  PolyInputIterator<Poly> end(){
-    return PolyInputIterator<Poly>(NULL, ptr->r);
+  PolyInputIterator<PolyBase> begin(){
+    return PolyInputIterator<PolyBase>(ptr->p,ptr->r);
+  }
+  PolyInputIterator<PolyBase> end(){
+    return PolyInputIterator<PolyBase>(NULL, ptr->r);
   }
   ring getRing(){
@@ -411 +417 @@
   }
  protected:
-  Poly(PolyImpl& impl):ptr(&impl){
+  PolyBase(PolyImpl& impl):ptr(&impl){
    
   }
@@ -419 +425 @@
  private:
   shared_ptr<PolyImpl> ptr;
-  friend inline Poly operator+(const Poly& p1, const Poly& p2);
-  friend inline Poly operator*(const Poly& p1, const Poly& p2);
-  friend inline Poly operator*(const Poly& p1, const Number& n);
+  //friend inline Poly operator+(const Poly& p1, const Poly& p2);
+  ///friend inline PolyBase operator*(const Poly& p1, const Poly& p2);
+  //friend inline PolyBase operator*(const Poly& p1, const Number& n);
   // 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 Number& p2);
 };
-
-inline Poly operator+(const Poly& p1, const Poly& p2){
+typedef PolyBase<RING> Poly;
+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(Poly(*res));
-}
-inline Poly operator*(const Poly& p1, const Poly& p2){
+    return(PolyBase<v>(*res));
+}
+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(Poly(*res));
-}
-inline Poly operator*(const Poly& p1, const Number& n){
+    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(Poly(*res));
+    return(PolyBase<v>(*res));
 }