Changeset bddc9d in git

Timestamp:

May 11, 2005, 4:58:35 PM (19 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

d149eb6e9a07ad85963aa398b2cddef32eedb4de

Parents:

36b1aae16eb13901ec207669cb99003b1937e4c1

Message:

*bricken: -shared bucket


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

Location:

kernel

Files:

• tgb.cc (modified) (12 diffs)
• tgb_internal.h (modified) (4 diffs)

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.15 2005-05-11 14:36:01 bricken Exp $ */
+/* $Id: tgb.cc,v 1.16 2005-05-11 14:58:34 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -185 +185 @@
       else s=bucket_guess(bucket);
     }
-    if (sum!=NULL){
-      if (c->is_char0)
-        s+=kSBucketLength(sum->ac->bucket);
-      else
-      {
-        if((pLexOrder) &&(!c->is_homog))
-        //if (false)
-          s+=kEBucketLength(sum->ac->bucket,this->p,c);
-        else
-          s+=bucket_guess(sum->ac->bucket);
-      }
-    }
+ 
     return s;
 }
@@ -526 +515 @@
 void red_object::canonicalize(){
   kBucketCanonicalize(bucket);
-  if(sum)
-    kBucketCanonicalize(sum->ac->bucket);
+  
   
 }
@@ -1677 +1665 @@
   red_object r2=ro;
   ro.validate();
-  if ((r2.p!=ro.p)||(r2.sev!=ro.sev)||(r2.sum!=ro.sum)) return FALSE;
+  if ((r2.p!=ro.p)||(r2.sev!=ro.sev)) return FALSE;
   return TRUE;
 }
@@ -1863 +1851 @@
     buf[j].p=p[j];
     buf[j].sev=pGetShortExpVector(p[j]);
-    buf[j].sum=NULL;
     buf[j].bucket = kBucketCreate(currRing);
     int len=pLength(p[j]);
@@ -4156 +4143 @@
 }
 void red_object::flatten(){
-  if (sum!=NULL)
-  {
-
- 
-    if(kBucketGetLm(sum->ac->bucket)!=NULL){
-      number mult_my=n_Mult(sum->c_my,sum->ac->multiplied,currRing);
-      number mult_my_h=mult_my;
-      number ac_h=sum->c_ac;
-      ksCheckCoeff(&mult_my_h, &ac_h);
-      nDelete(&sum->c_ac);
-      nDelete(&mult_my);
-      mult_my=mult_my_h;
-      sum->c_ac=ac_h;
-      poly add_this;
-      if(!nIsOne(mult_my))
-        kBucket_Mult_n(bucket,mult_my);
-      int len;
-      poly clear_into;
-      kBucketClear(sum->ac->bucket,&clear_into,&len);
-      if(sum->ac->counter>1){
-        add_this=pCopy(clear_into);
-        kBucketInit(sum->ac->bucket,clear_into,len);
-      }
-      else
-        add_this=clear_into;
-      if(!nIsOne(sum->c_ac))
-        pMult_nn(add_this, sum->c_ac);
-      
-      kBucket_Add_q(bucket,add_this, &len);
-       nDelete(&mult_my);
-     
-    }
-    nDelete(&sum->c_ac);
-    nDelete(&sum->c_my);
-   
-    sum->ac->decrease_counter();
-    delete sum;
-    p=kBucketGetLm(bucket);
-    sum=NULL;
-  }
   assume(p==kBucketGetLm(bucket));
-  assume(sum==NULL);
 }
 void red_object::validate(){
-  BOOLEAN flattened=FALSE;
-  if(sum!=NULL)
-  {
-    poly lm=kBucketGetLm(bucket);
-    poly lm_ac=kBucketGetLm(sum->ac->bucket);
-    if ((lm_ac==NULL)||((lm!=NULL) && (pLmCmp(lm,lm_ac)!=-1))){
-      flatten();
-      assume(sum==NULL);
-      flattened=TRUE;
-      p=kBucketGetLm(bucket);
-      if (p!=NULL)
-        sev=pGetShortExpVector(p);
-    } 
-    else
-    {
- 
-      p=lm_ac;
-      assume(sum->ac->sev==pGetShortExpVector(p));
-      sev=sum->ac->sev;
-    }
-    
-  }
-  else{
-    p=kBucketGetLm(bucket);
-    if(p)
+  p=kBucketGetLm(bucket);
+  if(p)
     sev=pGetShortExpVector(p);
-  }
-  assume((sum==NULL)||(kBucketGetLm(sum->ac->bucket)!=NULL));
 }
 int red_object::clear_to_poly(){
@@ -4238 +4159 @@
   
 
-void red_object::adjust_coefs(number c_r, number c_ac_r){
-  assume(this->sum!=NULL);
-  number n1=nMult(sum->c_my, c_ac_r);
-  number n2=nMult(sum->c_ac,c_r);
-  nDelete(&sum->c_my);
-  nDelete(&sum->c_ac);
- 
-  int ct = ksCheckCoeff(&n1, &n2);
-  sum->c_my=n1;
-  sum->c_ac=nNeg(n2);
-  //  nDelete(&n2);
-  
-
-}
+
 
 void reduction_step::reduce(red_object* r, int l, int u){}
@@ -4260 +4168 @@
 }
 
-void simple_reducer::target_is_a_sum_reduce(red_object & ro){
-  pTest(p);
-  kbTest(ro.bucket);
-  kbTest(ro.sum->ac->bucket);
-  assume(ro.sum!=NULL);
-  assume(ro.sum->ac!=NULL);
-  if(ro.sum->ac->last_reduction_id!=reduction_id){
-    number n1=kBucketPolyRed(ro.sum->ac->bucket,p, p_len, c->strat->kNoether);
-    number n2=nMult(n1,ro.sum->ac->multiplied);
-    nDelete(&ro.sum->ac->multiplied);
-    nDelete(&n1);
-    ro.sum->ac->multiplied=n2;
-    poly lm=kBucketGetLm(ro.sum->ac->bucket);
-    if (lm)
-      ro.sum->ac->sev=pGetShortExpVector(lm);
-    ro.sum->ac->last_reduction_id=reduction_id;
-  }
-  ro.sev=ro.sum->ac->sev;
-  ro.p=kBucketGetLm(ro.sum->ac->bucket);
-}
+
 void simple_reducer::reduce(red_object* r, int l, int u){
   this->pre_reduce(r,l,u);
@@ -4294 +4183 @@
   
 
-    if(r[i].sum==NULL)
-      this->target_is_no_sum_reduce(r[i]);
-
-    else 
-    {
-      this->target_is_a_sum_reduce(r[i]);
-      //reduce and adjust multiplied
-      r[i].sum->ac->last_reduction_id=reduction_id;
-      
-    }
-    //most elegant would be multimethods at this point and subclassing
-    //red_object for sum
+
+    this->target_is_no_sum_reduce(r[i]);
  
   }
@@ -4311 +4190 @@
     r[i].validate();
     #ifdef TGB_DEBUG
-    if (r[i].sum) r[i].sev=r[i].sum->ac->sev;
-
     #endif
-      }
+  }
 }
 reduction_step::~reduction_step(){}
@@ -4386 +4263 @@
   if(red_len>2*c->average_length){
     for(i=erg.to_reduce_l;i<=erg.to_reduce_u;i++){
-      if((r[i].sum==NULL) ||(r[i].sum->ac->counter<=AC_FLATTEN)) red_c++;
+      red_c++;
     }
   }
@@ -4408 +4285 @@
 
 
-  reduction_accumulator::reduction_accumulator(poly p, int p_len, poly high_to){
-    //sev needs to be removed from interfaces,makes no sense
-    
-
-    poly my=pOne();
-    counter=0;
-   
-    for(int i=1;i<=pVariables;i++)
-      pSetExp(my,i,(pGetExp(high_to, i)-pGetExp(p,i)));
-    pSetm(my);
-
-    last_reduction_id=-1;
-    multiplied=nInit(1);
-    bucket=kBucketCreate(currRing);
-    poly a=pMult_mm(pCopy(p->next),my);
-
-    this->sev=pGetShortExpVector(a);
-    kBucketInit(bucket, a,p_len-1);
-    pDelete(&my);
-  }
+ 
 void simple_reducer:: pre_reduce(red_object* r, int l, int u){}
 

kernel/tgb_internal.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb_internal.h,v 1.6 2005-05-11 14:36:02 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.7 2005-05-11 14:58:35 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -55 +55 @@
 
 //static ideal debug_Ideal;
-/** 
-    reduction_accumulators are objects which are shared by several sums
- **/
-
-class reduction_accumulator{
-  
- public:
-  /// (1/multiplied)*bucket=reduced original data
-  number multiplied;
-  ///the polynomial data
-  kBucket_pt bucket;
-  /// the short exponent vector
-  unsigned long sev;
-  /// the reference counter
-  int counter;
-  /// decrease the reference counter, at 0 it deletes the object
-  void decrease_counter(){ 
-    if((--counter)==0)
-      {
-        delete this; //self destruction
-      }
-  }
-  int last_reduction_id;
-  reduction_accumulator(poly p, int p_len, poly high_to);
-  ~reduction_accumulator(){
-    nDelete(&multiplied);
-    kBucketDeleteAndDestroy(&bucket);
-  }  
-
-  
-};
+
+
 struct poly_list_node{
   poly p;
   poly_list_node* next;
 };
-struct formal_sum_descriptor{
-  number c_my;
-  number c_ac;
-  reduction_accumulator* ac;
-};
+
 struct int_pair_node{
   int_pair_node* next;
@@ -163 +130 @@
   kBucket_pt bucket;
   poly p;
-  formal_sum_descriptor* sum;
   unsigned long sev;
   void flatten();
@@ -244 +210 @@
   ~simple_reducer();
 
-  virtual void target_is_a_sum_reduce(red_object & ro);
+
   virtual void target_is_no_sum_reduce(red_object & ro);
 };