Changeset 32f58c in git for Singular/tgb.cc

Timestamp:

Mar 9, 2003, 10:05:00 AM (21 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

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

Children:

2a22cffd10ee887105439aa0a1cad2c0e50be3a9

Parents:

964cd14fc725139c6e123ee86eff77496499bb97

Message:

*bricken: some abstraction


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

File:

• Singular/tgb.cc (modified) (3 diffs)

Singular/tgb.cc

@@ -2311 +2311 @@
     int i;
     int len;
-    poly reductor;
-    if(erg.fromS){
-      reductor=strat->S[erg.reduce_by];
-      len=strat->lenS[erg.reduce_by];
-      
-    }
-    else 
-    {
-      //bucket aufloesen reduzieren, neu füllen
-      
-   
-      int bn=kBucketCanonicalize(los[erg.reduce_by].bucket);
-      reductor=los[erg.reduce_by].bucket->buckets[bn];
-      len=los[erg.reduce_by].bucket->buckets_length[bn];
-      if(c->is_char0)
-        pContent(reductor);
- 
-    }
-    for(i=erg.to_reduce_l;i<=erg.to_reduce_u;i++)
-    {
-    
-      assume((erg.fromS)||(i!=erg.reduce_by));
-      assume(reductor!=NULL);
-       number coef=kBucketPolyRed(los[i].bucket,reductor,
-                                  len,
-                                  strat->kNoether);
-       nDelete(&coef);
-       los[i].p = kBucketGetLm(los[i].bucket);
-//        if(los[i].p!=NULL)
-//       if((i>0)&&(los[i-1].p!=NULL)&&(pLmEqual(los[i-1].p,los[i].p)))
-//           los[i].sev=los[i-1].sev;
-//       else
-//         los[i].sev=pGetShortExpVector(los[i].p);
-       los[i].validate();
-       //better would be first sorting before sev
-    }
- 
+
+    reduction_step *rs=create_reduction_step(erg, los, c);
+    rs->reduce(los,erg.to_reduce_l,erg.to_reduce_u);
+    finalize_reduction_step(rs);
                  
     int deleted=multi_reduction_clear_zeroes(los, losl, erg.to_reduce_l, erg.to_reduce_u);
@@ -2495 +2462 @@
     
 }
-void finalize_reduction_step(reduction_step* r){
-  delete r;
-}
+
 reduction_step* create_reduction_step(find_erg & erg, red_object* r, calc_dat* c){
   static int id=0;
@@ -2511 +2476 @@
   else
   {
+    
     kBucket_pt bucket=r[erg.reduce_by].bucket;
     kBucketClear(bucket,&pointer->p,&pointer->p_len);
 
     pointer->fill_back=bucket;
+    if(c->is_char0)
+      pContent(pointer->p);
   }