Changeset 82f499 in git for kernel/Poly.h

Timestamp:

Aug 17, 2005, 12:12:11 PM (19 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

bd78fe5e2fedb6e73b477dc7f5f60ec3cb150e4b

Parents:

c1e4cd403513c2cfaac94cde3319fe5d54a930de

Message:

*bricken: better structure


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

File:

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

kernel/Poly.h

@@ -1 @@
-//$Id: Poly.h,v 1.13 2005-08-17 09:42:15 bricken Exp $
+//$Id: Poly.h,v 1.14 2005-08-17 10:12:11 bricken Exp $
 
 
@@ -26 +26 @@
 class PolyImpl{
   friend class PolyBase<POLY_VARIANT_RING,Poly>;
+  friend class PolyBase<POLY_VARIANT_MODUL,Vector>;
   //friend class PolyBase<POLY_VARIANT_MODUL>;
   friend class Poly;
+  friend class Vector;
   //friend class Number;
  protected:
@@ -477 +479 @@
 
 };
+class Vector: public PolyBase<POLY_VARIANT_MODUL, Vector>{
+ 
+ public:
+
+  Vector(ring r=currRing):PolyBase<POLY_VARIANT_MODUL, Vector> ((poly)NULL,r,0){
+  }
+  Vector(int n, ring r=currRing):PolyBase<POLY_VARIANT_MODUL, Vector>(*(new PolyImpl(n,r))){
+    
+  }
+  Vector(const char* c, ring r=currRing):PolyBase<POLY_VARIANT_MODUL, Vector>(c,r){
+
+  }
+  Vector(const PolyBase<POLY_VARIANT_MODUL, Vector>& p):PolyBase<POLY_VARIANT_MODUL, Vector>(p){
+  }
+  
+  Vector(const Number& n):PolyBase<POLY_VARIANT_MODUL, Vector>(*(new PolyImpl(n))){
+    
+  }
+  Vector(poly p, ring r):PolyBase<POLY_VARIANT_MODUL, Vector>(p,r){
+    
+  }
+  Vector(poly p, ring r, int):PolyBase<POLY_VARIANT_MODUL, Vector>(p,r,0){
+  }
+  Vector(std::vector<int> v, ring r=currRing):PolyBase<POLY_VARIANT_MODUL, Vector>(*(new PolyImpl((poly) NULL,r))){
+    unsigned int i;
+    int s=v.size();
+    poly p=p_ISet(1,r);
+    for(i=0;i<v.size();i++){
+      pSetExp(p,i+1,v[i]);
+    }
+    pSetm(p);
+    ptr.reset(new PolyImpl(p,r));
+  }
+  /*  Poly& operator+=(const Number& n){
+  Poly p2(n);
+  ((PolyBase<POLY_VARIANT_MODUL, Poly>&) (*this))+=p2;
+  return *this;
+  }*/
+  Vector& operator+=(const Vector& p ){
+
+    ((PolyBase<POLY_VARIANT_MODUL, Vector>&)*this)+=p;
+    return *this;
+  }
+  Vector& operator+=(const PolyBase<POLY_VARIANT_MODUL, Vector>& p ){
+
+    ((PolyBase<POLY_VARIANT_MODUL, Vector>&)*this)+=p;
+    return *this;
+  }
+
+};
 
 //typedef Poly PolyBase<POLY_VARIANT_RING>::create_type;
@@ -500 +552 @@
 }
 
-Poly operator+(const Poly& p1, const Poly& p2){
-  Poly f(p1);
-  f+=p2;
+Poly operator+(const Poly& p1, const Number& n){
+ Poly f(p1);
+  f+=n;
   return f;
+  }
+template <poly_variant variant, class create_type> 
+  typename PolyBase<variant,create_type>::create_type 
+  operator+
+  (const PolyBase<variant,create_type>& b1, 
+   const PolyBase<variant,create_type>& b2)
+{
+  typename PolyBase<variant, create_type>::create_type erg(b1);
+  erg+=b2;
+  return erg;
 }