Changeset 24cabe in git for kernel/tgb.cc

Timestamp:

Sep 26, 2013, 1:38:02 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '4a9821a93ffdc22a6696668bd4f6b8c9de3e6c5f')

Children:

260c654e69c12b6deda08c5f3587eff3ac6ace1b

Parents:

9bfdcf268d8535fb2578d07c3ffb3aa4b438f30ecaf5880a642caa3f7049561818c3e0656b00b2d0

Message:

Merge pull request #375 from mmklee/slimgb

Slimgb

File:

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

kernel/tgb.cc

@@ -37 +37 @@
 static const int bundle_size_noro = 10000;
 static const int delay_factor = 3;
-int QlogSize (number n);
 #define ADD_LATER_SIZE 500
 #if 1
@@ -64 +63 @@
   if(rField_is_Q (r))
   {
-    return QlogSize (n);
+    return nlQlogSize (n, r->cf);
   }
   else
@@ -178 +177 @@
 }
 #endif
-struct snumber_dummy
-{
-  mpz_t z;
-  mpz_t n;
-  #if defined(LDEBUG)
-  int debug;
-  #endif
-  BOOLEAN s;
-};
-typedef struct snumber_dummy  *number_dummy;
-
-
-int QlogSize (number n)
-{
-  long nl=n_Size(n,currRing->cf);
-  if (nl==0L) return 0;
-  if (nl==1L)
-  {
-    long i = n_Int(n,currRing->cf);
-    unsigned long v;
-    v = (i >= 0) ? i : -i;
-    int r = 0;
-
-    while(v >>= 1)
-    {
-      r++;
-    }
-    return r + 1;
-  }
-  //assume denominator is 0
-  number_dummy nn=(number_dummy)n;
-  return mpz_sizeinbase (nn->z, 2);
-}
 
 #ifdef LEN_VAR3
@@ -219 +185 @@
   if(rField_is_Q (currRing))
   {
-    c = QlogSize (coef);
+    c = nlQlogSize (coef, currRing->cf);
   }
   else
@@ -250 +216 @@
   if(rField_is_Q (currRing))
   {
-    c = QlogSize (coef);
+    c = nlQlogSize (coef, currRing->cf);
   }
   else
@@ -267 +233 @@
     if(rField_is_Q (currRing))
     {
-      int modifier = QlogSize (pGetCoeff (b->coef[0]));
+      int modifier = nlQlogSize (pGetCoeff (b->coef[0]), currRing->cf);
       c += modifier;
     }
@@ -297 +263 @@
   if(rField_is_Q (currRing))
   {
-    c = QlogSize (coef);
+    c = nlQlogSize (coef, currRing->cf);
   }
   else
@@ -323 +289 @@
   if(rField_is_Q (currRing))
   {
-    c = QlogSize (coef);
+    c = nlQlogSize (coef, currRing->cf);
   }
   else
@@ -340 +306 @@
     if(rField_is_Q (currRing))
     {
-      int modifier = QlogSize (pGetCoeff (b->coef[0]));
+      int modifier = nlQlogSize (pGetCoeff (b->coef[0]), currRing->cf);
       c += modifier;
     }
@@ -572 +538 @@
       if(rField_is_Q (currRing))
       {
-        cs = QlogSize (coef);
+        cs = nlQlogSize (coef, currRing->cf);
       }
       else
@@ -626 +592 @@
       if(rField_is_Q (currRing))
       {
-        cs = QlogSize (coef);
+        cs = nlQlogSize (coef, currRing->cf);
       }
       else
@@ -635 +601 @@
         if(rField_is_Q (currRing))
         {
-          int modifier = QlogSize (pGetCoeff (bucket->coef[0]));
+          int modifier = nlQlogSize (pGetCoeff (bucket->coef[0]), currRing->cf);
           cs += modifier;
         }