Changeset 36b1aa in git

Timestamp:

May 11, 2005, 4:36:02 PM (19 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

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

Children:

bddc9d2711c370b6792832b479116d50c0ea2273

Parents:

7c20514255fa4f5d6b76e6b96f42af24270fbecf

Message:

*bricken: - shared bucket


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

Location:

kernel

Files:

• tgb.cc (modified) (5 diffs)
• tgb_internal.h (modified) (2 diffs)

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.14 2005-05-11 10:11:53 bricken Exp $ */
+/* $Id: tgb.cc,v 1.15 2005-05-11 14:36:01 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -4325 +4325 @@
     
 }
- join_simple_reducer::~join_simple_reducer(){
-   if(fill_back!=NULL)
-   {
-     kBucketInit(fill_back,p,p_len);
-   }
-   fill_back=NULL;
-    
-}
+ 
 void multi_reduce_step(find_erg & erg, red_object* r, calc_dat* c){
   static int id=0;
@@ -4397 +4390 @@
   }
   assume(red_len==pLength(red));
-  if (red_c>=AC_NEW_MIN)
-    pointer=new join_simple_reducer(red,red_len,r[erg.to_reduce_l].p);
-  else
-    pointer=new simple_reducer(red,red_len,c);
+ 
+  pointer=new simple_reducer(red,red_len,c);
 
   if ((!woc) && (!erg.fromS))
@@ -4415 +4406 @@
 };
 
-void join_simple_reducer::target_is_no_sum_reduce(red_object & ro){
-  kbTest(ro.bucket);
-  ro.sum=new formal_sum_descriptor();
-  ro.sum->ac=ac;
-  ac->counter++;
-  kBucket_pt bucket=ro.bucket;
-  poly a1 = pNext(p), lm = kBucketExtractLm(bucket);
-  BOOLEAN reset_vec=FALSE;
-  number rn;
-  assume(a1!=NULL);
-  number an = pGetCoeff(p), bn = pGetCoeff(lm);
-  lm->next=NULL;
-  int ct = ksCheckCoeff(&an, &bn);
-  ro.sum->c_ac=nNeg(bn);
-  ro.sum->c_my=an;
-  assume(nIsZero(nAdd(nMult(ro.sum->c_my,lm->coef),nMult(p->coef,ro.sum->c_ac) )));
-  if (p_GetComp(p, bucket->bucket_ring) != p_GetComp(lm, bucket->bucket_ring))
-  {
-    p_SetCompP(a1, p_GetComp(lm, bucket->bucket_ring), bucket->bucket_ring);
-    reset_vec = TRUE;
-    p_SetComp(lm, p_GetComp(p, bucket->bucket_ring), bucket->bucket_ring);
-    p_Setm(lm, bucket->bucket_ring);
-  }
-
-
-  
-
-  p_DeleteLm(&lm, bucket->bucket_ring);
-  if (reset_vec) p_SetCompP(a1, 0, bucket->bucket_ring);
-  kbTest(bucket);
-
-}
+
 
   reduction_accumulator::reduction_accumulator(poly p, int p_len, poly high_to){
@@ -4469 +4429 @@
   }
 void simple_reducer:: pre_reduce(red_object* r, int l, int u){}
-void join_simple_reducer:: pre_reduce(red_object* r, int l, int u){
-  for(int i=l;i<=u;i++)
-    {
-      if (r[i].sum){
-        if(r[i].sum->ac->counter<=AC_FLATTEN) r[i].flatten();
-        
-      }
-    }
-}
+

kernel/tgb_internal.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb_internal.h,v 1.5 2005-05-11 10:11:54 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.6 2005-05-11 14:36:02 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -247 +247 @@
   virtual void target_is_no_sum_reduce(red_object & ro);
 };
-class join_simple_reducer:public simple_reducer{
- public:
-  join_simple_reducer(poly p, int p_len, poly high_to):simple_reducer(p,p_len){
-    ac=new reduction_accumulator( p, p_len, high_to);
-   
-    
-  }
-    ~join_simple_reducer();
-   void pre_reduce(red_object* r, int l, int u);
-  void target_is_no_sum_reduce(red_object & ro);
-  reduction_accumulator* ac;
-};
+
 //class sum_canceling_reducer:public reduction_step {
 //  void reduce(red_object* r, int l, int u);