Changeset d02d9c in git

Timestamp:

Mar 6, 2003, 8:57:26 PM (21 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8b0b91bf90977a8e39fcf4165e87da8519abbaa6

Parents:

96504053d86d42ee1a2a0df017d65d07711469d7

Message:

*bricken: work in progress


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

Location:

Singular

Files:

• tgb.cc (modified) (6 diffs)
• tgb.h (modified) (4 diffs)

Singular/tgb.cc

@@ -1987 +1987 @@
       int best=erg.to_reduce_u+1;
       for (i=erg.to_reduce_u;i>=erg.to_reduce_l;i--){
-        int qc=guess_quality(los[i],c);
+        int qc=los[i].guess_quality(c);
         if (qc<quality_a){
           best=i;
@@ -2013 +2013 @@
         int best=erg.to_reduce_u+1;
         for (i=erg.to_reduce_u;i>=erg.to_reduce_l;i--){
-          int qc=guess_quality(los[i],c);
+          int qc=los[i].guess_quality(c);
           if (qc<quality_a){
             best=i;
@@ -2033 +2033 @@
         assume(erg.to_reduce_u==erg.to_reduce_l);
         int quality_a=quality_of_pos_in_strat_S(erg.reduce_by,c);
-        int qc=guess_quality(los[erg.to_reduce_u],c);
+        int qc=los[erg.to_reduce_u].guess_quality(c);
         if(qc<quality_a){
           BOOLEAN exp=FALSE;
@@ -2069 +2069 @@
       assume(erg.reduce_by==erg.to_reduce_u+1);
       int best=erg.reduce_by;
-      int quality_a=guess_quality(los[erg.reduce_by],c);
+      int quality_a=los[erg.reduce_by].guess_quality(c);
       int i;
         for (i=erg.to_reduce_u;i>=erg.to_reduce_l;i--){
-          int qc=guess_quality(los[i],c);
+          int qc=los[i].guess_quality(c);
           if (qc<quality_a){
             best=i;
@@ -2094 +2094 @@
       //with same leading term
       int il=erg.reduce_by;
-      int quality_a =guess_quality(los[erg.reduce_by],c);
+      int quality_a =los[erg.reduce_by].guess_quality(c);
       int qc;
       while((il>0) && pLmEqual(los[il-1].p,los[il].p)){
         il--;
-        qc=guess_quality(los[il],c);
+        qc=los[il].guess_quality(c);
         if (qc<quality_a){
           quality_a=qc;
@@ -2411 +2411 @@
 
 }
+
+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
+  if(this->sum==NULL)
+    kBucketPolyRed(this->bucket,reductor_full,
+                   full_len,
+                   c->strat->kNoether);
+  else 
+  {
+    assume(sum->ac!=NULL);
+    if(sum->ac->last_reduction_id!=reduction_id){
+      
+
+
+      
+      
+      number n1=kBucketPolyRed(sum->ac->bucket,reductor_full, full_len, c->strat->kNoether);
+      number n2=nMult(n1,sum->ac->multiplied);
+      nDelete(&sum->ac->multiplied);
+      nDelete(&n1);
+      sum->ac->multiplied=n2;
+    }
+      //reduce and adjust multiplied
+      sum->ac->last_reduction_id=reduction_id;
+      
+  }
+    
+      
+}
+  
+
+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);
+  
+
+}
+int red_object::guess_quality(calc_dat* c){
+    //works at the moment only for lenvar 1, because in different
+    //case, you have to look on coefs
+    int s=0;
+    if (c->is_char0)
+      s=kSBucketLength(bucket);
+    else 
+      s=bucket_guess(bucket);
+    if (sum!=NULL){
+      if (c->is_char0)
+      s+=kSBucketLength(sum->ac->bucket);
+    else 
+      s+=bucket_guess(sum->ac->bucket);
+    }
+    return s;
+}

Singular/tgb.h

@@ -27 +27 @@
 //#define REDTAIL_PROT
 //#define QUICK_SPOLY_TEST
+struct sorted_pair_node{
+  //criterium, which is stable 0. small lcm 1. small i 2. small j
+  int i;
+  int j;
+  int deg;
+  int expected_length;
+  poly lcm_of_lm;
+};
+
 
 /** 
@@ -45 +54 @@
     if((--counter)==0)
       {
-        nDelete(&multiplied);
-        kBucketDeleteAndDestroy(&bucket);
         delete this; //self destruction
       }
   }
+  int last_reduction_id;
+  reduction_accumulator(){
+    last_reduction_id=-1;
+    bucket=kBucketCreate(currRing);
+  }
+  ~reduction_accumulator(){
+    nDelete(&multiplied);
+    kBucketDeleteAndDestroy(&bucket);
+  }  
+
   
 };
@@ -62 +79 @@
   int b;
 };
-class red_object{
- public:
-  kBucket_pt bucket;
-  poly p;
-  formal_sum_descriptor* sum;
-  unsigned long sev;
-  void flatten();
-  void validate();
-};
-struct sorted_pair_node{
-  //criterium, which is stable 0. small lcm 1. small i 2. small j
-  int i;
-  int j;
-  int deg;
-  int expected_length;
-  poly lcm_of_lm;
-};
-
-
-enum calc_state
-  {
-    UNCALCULATED,
-    HASTREP,
-    UNIMPORTANT,
-    SOONTREP
-  };
 struct calc_dat
 {
@@ -116 +107 @@
   BOOLEAN is_char0;
 };
+class red_object{
+ public:
+  kBucket_pt bucket;
+  poly p;
+  formal_sum_descriptor* sum;
+  unsigned long sev;
+  void flatten();
+  void validate();
+  void red_object::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);
+};
+
+
+enum calc_state
+  {
+    UNCALCULATED,
+    HASTREP,
+    UNIMPORTANT,
+    SOONTREP
+  };
+
 static int add_to_reductors(calc_dat* c, poly h, int len);
 static int bucket_guess(kBucket* bucket);