Changeset 1821d6 in git for kernel/tgb.cc

Timestamp:

May 31, 2005, 3:24:50 PM (19 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

e1b6944781656194be38a6eb2169d671cce4b260

Parents:

633c14f4823fb23f2af377f34acabec7a63caa49

Message:

*bricken: coef buckets now really supported, char 0 finer


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

File:

• kernel/tgb.cc (modified) (6 diffs)

kernel/tgb.cc

@@ -5 +5 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: tgb.cc,v 1.29 2005-05-30 11:44:07 bricken Exp $ */
+/* $Id: tgb.cc,v 1.30 2005-05-31 13:24:50 bricken Exp $ */
 /*
 * ABSTRACT: slimgb and F4 implementation
@@ -14 +14 @@
 #include "tgbgauss.h"
 #include "F4.h"
+#include "longrat.h"
 static const int bundle_size=100;
 #if 1
@@ -64 +65 @@
 #ifdef LEN_VAR3
 // 3.Variante: Laenge: Platz fuer Leitk * Monomanzahl
+
+int QlogSizeClassic(number bigint){
+  if(nlIsZero(bigint)) return 0;
+  number absv=nlCopy(bigint);
+  number two=nlInit(2);
+  if(!(nlGreaterZero(absv)))
+    absv=nlNeg(absv);
+  int ls=0;
+  number comp=nlInit(1);
+  BOOLEAN equal=FALSE;
+  while(!(nlGreater(comp,absv))) {
+    ls++;
+    if (nlEqual(comp,absv)){
+      equal=TRUE;
+      break;
+    }
+    number temp=comp;
+    comp=nlMult(comp,two);
+    nlDelete(&temp, currRing);
+    
+  }
+  if(!equal)
+    ls++;
+  nlDelete(&two,currRing);
+  nlDelete(&absv,currRing);
+  nlDelete(&comp,currRing);
+  //Print("%d\n",ls);
+  return ls;
+}
+int QlogSize(number bigint){
+  int size=nlSize(bigint);
+  if(size<=1) return QlogSizeClassic(bigint);
+  else return sizeof(mp_limb_t)*size*8;
+  }
 inline int pSLength(poly p,int l)
 {
-  int c=nSize(pGetCoeff(p));
+  int c;
+  number coef=pGetCoeff(p);
+  if (rField_is_Q(currRing)){
+    c=QlogSize(coef);
+  }
+  else
+    c=nSize(coef);
+  
   return c*l /*pLength(p)*/;
 }
+//! TODO CoefBuckets berücksichtigen
 int kSBucketLength(kBucket* b, poly lm=NULL)
 {
   int s=0;
   int c;
+  number coef;
   if(lm==NULL)
-    c=nSize(pGetCoeff(kBucketGetLm(b)));
+    coef=pGetCoeff(kBucketGetLm(b));
+    //c=nSize(pGetCoeff(kBucketGetLm(b)));
   else
-    c=nSize(pGetCoeff(lm));
+    coef=pGetCoeff(lm);
+    //c=nSize(pGetCoeff(lm));
+  if (rField_is_Q(currRing)){
+    c=QlogSize(coef);
+  }
+  else
+    c=nSize(coef);
+  
   int i;
   for (i=b->buckets_used;i>=0;i--)
@@ -83 +135 @@
     s+=b->buckets_length[i] /*pLength(b->buckets[i])*/;
   }
+  #ifdef HAVE_COEF_BUCKETS
+  assume(b->buckets[0]==kBucketGetLm(b));
+  if (b->coef[0]!=NULL){
+    
+    if (rField_is_Q(currRing)){
+      int modifier=QlogSize(pGetCoeff(b->coef[0]));
+      c+=modifier;
+  }
+    else{
+      int modifier=nSize(pGetCoeff(b->coef[0]));
+      c*=modifier;}
+    }
+  #endif
   return s*c;
 }
@@ -178 +243 @@
     int s=0;
     if (c->is_char0)
-      s=kSBucketLength(bucket,this->p);
+      //s=kSBucketLength(bucket,this->p);
+      s=kSBucketLength(bucket,NULL);
     else 
     {
@@ -2113 +2179 @@
 }
 ideal t_rep_gb(ring r,ideal arg_I, BOOLEAN F4_mode){
+  
+  //  Print("QlogSize(0) %d, QlogSize(1) %d,QlogSize(-2) %d, QlogSize(5) %d\n", QlogSize(nlInit(0)),QlogSize(nlInit(1)),QlogSize(nlInit(-2)),QlogSize(nlInit(5)));
+  
+  
+  
   if (TEST_OPT_PROT)
     if (F4_mode)