Changeset f52579a in git for kernel/kbuckets.cc

Timestamp:

Dec 13, 2005, 2:46:08 PM (18 years ago)

Author:

Michael Brickenstein <bricken@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

faa6c64caa0a460d2fe5f4d0ec4a6c22f0ff9b68

Parents:

6007a312e9f00a2be9b0dceab0080a494ac3f92c

Message:

*bricken: second step, still a long way


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

File:

• kernel/kbuckets.cc (modified) (7 diffs)

kernel/kbuckets.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kbuckets.cc,v 1.4 2005-12-13 12:22:45 bricken Exp $ */
+/* $Id: kbuckets.cc,v 1.5 2005-12-13 13:46:08 bricken Exp $ */
 
 #include "mod2.h"
@@ -380 +380 @@
   if (i > 0)
   {
+  #ifdef USE_COEF_BUCKETS
+    MULTIPLY_BUCKET(bucket,i);
+    //bucket->coef[i]=NULL;
+#endif
     *p = bucket->buckets[i];
     *length = bucket->buckets_length[i];
@@ -385 +389 @@
     bucket->buckets_length[i] = 0;
     bucket->buckets_used = 0;
-#ifdef USE_COEF_BUCKETS
-    MULTIPLY_BUCKET(bucket,i);
-    //bucket->coef[i]=NULL;
-#endif
+
   }
   else
@@ -690 +691 @@
   kbTest(bucket);
   i = pLogLength(l1);
-
+  number n=n_Init(1,r);
   if (i <= bucket->buckets_used && bucket->buckets[i] != NULL)
   {
@@ -703 +704 @@
   else
   {
+    number swap_n=p_GetCoeff(m,r);
+    
+    assume(n_IsOne(n,r));
+    p_SetCoeff0(m,n,r);
+    n=swap_n;
+    //p_SetCoeff0(n, swap_n, r);
+    //p_GetCoeff0(n, swap_n,r);
+    
     p1 = r->p_Procs->pp_Mult_mm(p1, m, r, last);
   }
@@ -708 +717 @@
   while (bucket->buckets[i] != NULL)
   {
+
+    
+    
+    //don't do that, pull out gcd
+    if(!(n_IsOne(n,r))) {
+        p1=p_Mult_nn(p1, n, r);
+        n_Delete(&n,r);
+        n=n_Init(1,r);
+    }
+    
     MULTIPLY_BUCKET(bucket,i);
     p1 = p_Add_q(p1, bucket->buckets[i],
@@ -716 +735 @@
   }
 
+  
   bucket->buckets[i] = p1;
+  
+  assume(bucket->coef[i]==NULL);
+  if (!(n_IsOne(n,r))){
+    bucket->coef[i]=p_NSet(n,r);
+  } else {
+    bucket->coef[i]=NULL;
+    n_Delete(&n,r);
+  }
+  
   bucket->buckets_length[i]=l1;
   if (i >= bucket->buckets_used)