Changeset 2a22cff in git

Timestamp:

Mar 9, 2003, 12:39:26 PM (21 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9685005c0bab8517e454c02e230b36d2946c838d

Parents:

32f58cd398994310d68f0171a7b1eda5d17811ba

Message:

*bricken: work in progress


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

Location:

Singular

Files:

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

Singular/tgb.cc

@@ -2390 +2390 @@
   return l;
 }
-void red_object::reduction_step(int reduction_id, poly reductor_full, int full_len, poly reductor_part, reduction_accumulator* join_to, calc_dat* c)
-{
-  //we have to add support later for building new sums at this points, this involves a change in the interface
-      
-}
+
   
 
@@ -2428 +2424 @@
 }
 void reduction_step::reduce(red_object* r, int l, int u){}
+void simple_reducer::target_is_no_sum_reduce(red_object & ro){
+  kBucketPolyRed(ro.bucket,p,
+                 p_len,
+                 c->strat->kNoether);
+}
+
+void simple_reducer::target_is_a_sum_reduce(red_object & ro){
+  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;
+  }
+}
 void simple_reducer::reduce(red_object* r, int l, int u){
   int i;
   for(i=l;i<=u;i++){
     if(r[i].sum==NULL)
-      kBucketPolyRed(r[i].bucket,p,
-                     p_len,
-                     c->strat->kNoether);
+      this->target_is_no_sum_reduce(r[i]);
+
     else 
     {
-      assume(r[i].sum->ac!=NULL);
-      if(r[i].sum->ac->last_reduction_id!=reduction_id){
-        number n1=kBucketPolyRed(r[i].sum->ac->bucket,p, p_len, c->strat->kNoether);
-        number n2=nMult(n1,r[i].sum->ac->multiplied);
-        nDelete(&r[i].sum->ac->multiplied);
-        nDelete(&n1);
-        r[i].sum->ac->multiplied=n2;
-      }
+      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
  
   }

Singular/tgb.h

@@ -118 +118 @@
   void flatten();
   void validate();
-  void reduction_step(int reduction_id, poly reductor_full, int full_len, poly reductor_part, reduction_accumulator* join_to, calc_dat* c);
   void adjust_coefs(number c_r, number c_ac_r);
   int guess_quality(calc_dat* c);
@@ -185 +184 @@
   kBucket_pt fill_back;
   int p_len;
-
-  void reduce(red_object* r, int l, int u);
+  
+  virtual void reduce(red_object* r, int l, int u);
   ~simple_reducer();
+ protected:
+  virtual void target_is_a_sum_reduce(red_object & ro);
+  virtual void target_is_no_sum_reduce(red_object & ro);
 };
 //class sum_canceling_reducer:public reduction_step {