Changeset d5a330 in git for libpolys/polys/kbuckets.cc

Timestamp:

Mar 6, 2013, 2:27:37 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '2234726c50d679d6664181a5c72f75a6fd64a787')

Children:

825fb7e9602cb5db3284b92d7dd82a01e88c9600

Parents:

803cb2d20d4037b513adf020767d48f6893fc9a2

Message:

fix: unify changes for HAVE_RING and HAVE_PLURAL

File:

• libpolys/polys/kbuckets.cc (modified) (2 diffs)

libpolys/polys/kbuckets.cc

@@ -716 +716 @@
   i = pLogLength(l1);
 
-  if ((i <= bucket->buckets_used) && (bucket->buckets[i] != NULL))
-  {
-    assume(pLength(bucket->buckets[i])==bucket->buckets_length[i]);
+#if defined(HAVE_RINGS)||defined(HAVE_PLURAL)
+  if ((rField_is_Ring(r) && !(rField_is_Domain(r)))
+  ||(rIsPluralRing(r)))
+  {
+    pSetCoeff0(m, n_Neg(pGetCoeff(m),r->cf));
+    p1=pp_Mult_mm(p,m,r);
+    pSetCoeff0(m, n_Neg(pGetCoeff(m),r->cf));
+    l1=pLength(p1);
+    i = pLogLength(l1);
+  }
+  else
+#endif
+  {
+    if ((i <= bucket->buckets_used) && (bucket->buckets[i] != NULL))
+    {
+      assume(pLength(bucket->buckets[i])==bucket->buckets_length[i]);
 //#ifdef USE_COEF_BUCKETS
 //     if(bucket->coef[i]!=NULL)
@@ -730 +743 @@
 //     else
 //#endif
-    MULTIPLY_BUCKET(bucket,i);
-    p1 = p_Minus_mm_Mult_qq(bucket->buckets[i], m, p1,
+      MULTIPLY_BUCKET(bucket,i);
+      p1 = p_Minus_mm_Mult_qq(bucket->buckets[i], m, p1,
                             bucket->buckets_length[i], l1,
                             spNoether, r);
-    l1 = bucket->buckets_length[i];
-    bucket->buckets[i] = NULL;
-    bucket->buckets_length[i] = 0;
-#ifdef HAVE_RINGS
-    if (rField_is_Ring(r) && !(rField_is_Domain(r)))
-    {
-      l1 = pLength(p1);
+      l1 = bucket->buckets_length[i];
+      bucket->buckets[i] = NULL;
+      bucket->buckets_length[i] = 0;
       i = pLogLength(l1);
     }
-#endif
-#ifdef HAVE_PLURAL
-    if (rIsPluralRing(r))
-    {
-      l1 = pLength(p1);
-      i = pLogLength(l1);
-    }
-#endif
-  }
-  else
-  {
-    pSetCoeff0(m, n_Neg(pGetCoeff(m),r->cf));
-    if (spNoether != NULL)
-    {
-      l1 = -1;
-      p1 = r->p_Procs->pp_Mult_mm_Noether(p1, m, spNoether, l1, r);
-      i = pLogLength(l1);
-    }
     else
     {
-      p1 = r->p_Procs->pp_Mult_mm(p1, m, r);
-#ifdef HAVE_RINGS
-      if (rField_is_Ring(r) && !(rField_is_Domain(r)))
+      pSetCoeff0(m, n_Neg(pGetCoeff(m),r->cf));
+      if (spNoether != NULL)
       {
-        l1 = pLength(p1);
+        l1 = -1;
+        p1 = r->p_Procs->pp_Mult_mm_Noether(p1, m, spNoether, l1, r);
         i = pLogLength(l1);
       }
-#endif
-#ifdef HAVE_PLURAL
-      if (rIsPluralRing(r))
+      else
       {
-        l1 = pLength(p1);
-        i = pLogLength(l1);
+        p1 = r->p_Procs->pp_Mult_mm(p1, m, r);
       }
-#endif
-    }
-    pSetCoeff0(m, n_Neg(pGetCoeff(m),r->cf));
+      pSetCoeff0(m, n_Neg(pGetCoeff(m),r->cf));
+    }
   }