Changeset d64382 in git

Timestamp:

Nov 9, 2006, 9:15:52 AM (17 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

bc5e56344b6761dd9dc617b39142ba3893b23a0c

Parents:

c84b905c9f27db30242a080d84876253a7ce9e2c

Message:

+ sugar for elimination length optimization


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

Location:

kernel

Files:

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

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.104 2006-10-25 10:14:51 bricken Exp $ */
+/* $Id: tgb.cc,v 1.105 2006-11-09 08:15:51 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -11 +11 @@
 //#include <vector>
 //using namespace std;
+
+
+///@TODO: delay nur auf Sugarvergrößerung
+///@TODO: grade aus ecartS, setze dazu strat->honey; und nutze p.ecart
 #include "mod2.h"
 #include "tgb.h"
@@ -397 +401 @@
 }
 
-wlen_type kEBucketLength(kBucket* b, poly lm,slimgb_alg* ca)
+wlen_type kEBucketLength(kBucket* b, poly lm,int sugar,slimgb_alg* ca)
 {
   wlen_type s=0;
@@ -408 +412 @@
   }
   int d=pTotaldegree(lm,ca->r);
+  #if 1
+  assume(sugar>=d);
+  s=1+(bucket_guess(b)-1)*(sugar-d+1);
+  return s;
+  #else
+  
+  
+  //int d=pTotaldegree(lm,ca->r);
   int i;
   for (i=b->buckets_used;i>=0;i--)
@@ -421 +433 @@
   }
   return s;
+  #endif
 }
 
@@ -505 +518 @@
     #endif
     //FIXME:not quadratic
-    wlen_type erg=kEBucketLength(this->bucket,this->p,c);
+    wlen_type erg=kEBucketLength(this->bucket,this->p,this->sugar,c);
     //erg*=cs;//for quadratic
     erg*=cs;
@@ -519 +532 @@
       if(c->eliminationProblem)
   //if (false)
-  s=kEBucketLength(this->bucket,this->p,c);
+  s=kEBucketLength(this->bucket,this->p,this->sugar,c);
       else s=bucket_guess(bucket);
     }
@@ -1800 +1813 @@
     buf[j].sev=pGetShortExpVector(p[j]);
     buf[j].bucket = kBucketCreate(currRing);
-
+    if (c->eliminationProblem){
+        buf[j].sugar=pTotaldegree_full(p[j]);
+    }
     int len=pLength(p[j]);
     kBucketInit(buf[j].bucket,buf[j].p,len);
@@ -3090 +3105 @@
     int old_length=c->strat->lenS[j];// in view of S
     los[bp].p=p;
+    if (c->eliminationProblem){
+        los[bp].sugar=pTotaldegree_full(p);
+    }
     kBucketInit(los[bp].bucket,p,old_length);
     wlen_type qal=pQuality(clear_into,c,new_length);
@@ -3222 +3240 @@
     assume((i==losl-1)||(pLmCmp(los[i].p,los[i+1].p)<=0));
     assume(is_valid_ro(los[i]));
+    assume((!(c->eliminationProblem))||(los[i].sugar>=pTotaldegree(los[i].p)));
     j=kFindDivisibleByInS_easy(strat,los[i]);
     if(j>=0){
@@ -3499 +3518 @@
 //debug start
   int im;
-
+ 
+  int reducer_deg;
+  if(c->eliminationProblem){
+    assume(p_LmEqual(r[l].p,r[u].p,c->r));
+    int lm_deg=pTotaldegree(r[l].p);
+    reducer_deg=lm_deg+pTotaldegree_full(p)-pTotaldegree(p);
+  }
 
   for(i=l;i<=u;i++){
@@ -3506 +3531 @@
 
     this->do_reduce(r[i]);
-
+    if (c->eliminationProblem){
+        r[i].sugar=si_max(r[i].sugar,reducer_deg);
+    }
   }
   for(i=l;i<=u;i++){
@@ -3553 +3580 @@
     }
     pNormalize(red);
-
+    if (c->eliminationProblem){
+        r[rn].sugar=pTotaldegree_full(red);
+    }
 
     if ((!(erg.fromS))&&(TEST_V_UPTORADICAL)){

kernel/tgb_internal.h

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb_internal.h,v 1.45 2006-10-25 10:14:52 bricken Exp $ */
+/* $Id: tgb_internal.h,v 1.46 2006-11-09 08:15:52 bricken Exp $ */
 /*
  * ABSTRACT: tgb internal .h file
@@ -174 +174 @@
   poly p;
   unsigned long sev;
+  int sugar;
   void flatten();
   void validate();