Changeset 7ddfab in git

Timestamp:

Jul 13, 2018, 3:51:16 PM (5 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

55b29ffa7e5ceaaf5e8681e442c601fdf88fd855

Parents:

0612fd84c8ed63efc96d7b8645ceb1f37b32cd17

Message:

LObject::CanonicalizeP/Normalize

Files:

• kernel/GBEngine/kInline.h (modified) (2 diffs)
• kernel/GBEngine/kstd1.cc (modified) (1 diff)
• kernel/GBEngine/kutil.h (modified) (1 diff)
• libpolys/polys/kbuckets.cc (modified) (2 diffs)
• libpolys/polys/kbuckets.h (modified) (1 diff)

kernel/GBEngine/kInline.h

@@ -334 +334 @@
     pNormalize(p);
   }
+  if (bucket!=NULL) kBucketNormalize(bucket);
+}
+
+KINLINE void sLObject::CanonicalizeP()
+{
+  if (bucket != NULL)
+    kBucketCanonicalize(bucket);
 }
 
@@ -638 +645 @@
   Set(pn, tailRing);
   return ret;
-}
-
-KINLINE poly sLObject::CanonicalizeP()
-{
-  //kTest_L(this);
-  int i = -1;
-
-  if (bucket != NULL)
-    i = kBucketCanonicalize(bucket);
-
-  if (p == NULL)
-    p = k_LmInit_tailRing_2_currRing(t_p, tailRing);
-
-  if (i >= 0) pNext(p) = bucket->buckets[i];
-  return p;
 }
 

kernel/GBEngine/kstd1.cc

@@ -993 +993 @@
   if (L->bucket != NULL)
   {
-    poly p = L->CanonicalizeP();
-    BOOLEAN ret = hasPurePower(p, last, length, strat);
-    pNext(p) = NULL;
-    return ret;
+    poly p = L->GetP();
+    return hasPurePower(p, last, length, strat);
   }
   else

kernel/GBEngine/kutil.h

@@ -220 +220 @@
   // does not delete bucket, just canonicalizes it
   // returned poly is such that Lm(p) \in currRing, Tail(p) \in tailRing
-  KINLINE poly CanonicalizeP();
+  KINLINE void CanonicalizeP();
 
   // makes a copy of the poly of L

libpolys/polys/kbuckets.cc

@@ -369 +369 @@
 int kBucketCanonicalize(kBucket_pt bucket)
 {
+#ifndef HAVE_PSEUDO_BUCKETS
   assume(bucket->buckets_used<=MAX_BUCKET);
   MULTIPLY_BUCKET(bucket,1);
@@ -438 +439 @@
   kbTest(bucket);
   return i;
+#endif
+}
+
+void kBucketNormalize(kBucket_pt bucket)
+{
+#ifdef HAVE_PSEUDO_BUCKETS
+  p_Normalize(bucket->p,bucket->bucket_ring);
+#else
+  MULTIPLY_BUCKET(bucket,1);
+  for (int i=0; i<=bucket->buckets_used; i++)
+  {
+    p_Normalize(bucket->buckets[i],bucket->bucket_ring);
+  }
+#endif
 }
 

libpolys/polys/kbuckets.h

@@ -48 +48 @@
 }
 
-// Canonicalizes Bpoly, i.e. converts polys of buckets into one poly in
-// one bucket: Returns number of bucket into which it is canonicalized
+/// Canonicalizes Bpoly, i.e. converts polys of buckets into one poly in
+/// one bucket: Returns number of bucket into which it is canonicalized
 int kBucketCanonicalize(kBucket_pt bucket);
+
+/// apply n_Normalize to all coefficients
+void kBucketNormalize(kBucket_pt bucket);
 
 /////////////////////////////////////////////////////////////////////////////