Changeset e2c597 in git

Timestamp:

Oct 23, 2021, 3:36:05 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

b4b74c58962d8ea2198ff792eed53fc85d857e74

Parents:

6f184ed5718756bb0410a3aebe5f372b76edd55f

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-10-23 15:36:05+02:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2021-10-23 15:48:28+02:00

Message:

Revert "ring-cf: p_Norm/p_Cleardenom*/p_Content*"
(revert only p_Content part)

This reverts commit d28095befe49d41be7cd3b72963b0f39b4bcd6cd.

File:

• libpolys/polys/monomials/p_polys.cc (modified) (9 diffs)

libpolys/polys/monomials/p_polys.cc

@@ -2284 +2284 @@
 {
   if (ph==NULL) return;
-  if (rField_is_Ring(r)) /*should not be called*/
-  {
-    if(!n_GreaterZero(pGetCoeff(ph),r->cf)) ph = p_Neg(ph,r);
-    return;
-  }
   const coeffs cf=r->cf;
   if (pNext(ph)==NULL)
@@ -2349 +2344 @@
   {
     c=n_Init(1,cf);
-    return;
-  }
-  if (rField_is_Ring(r)) /*should not be called*/
-  {
-    if(!n_GreaterZero(pGetCoeff(ph),cf))
-    {
-      ph = p_Neg(ph,r);
-      c=n_Init(-1,cf);
-    }
-    else
-      c=n_Init(1,cf);
     return;
   }
@@ -2638 +2622 @@
   if(TEST_OPT_CONTENTSB) return;
   if (ph==NULL) return;
-  if (rField_is_Ring(r)) /*should not be called*/
-  {
-    return;
-  }
   if (pNext(ph)==NULL)
   {
@@ -2926 +2906 @@
   assume( r != NULL );
   assume( r->cf != NULL );
-  assume(!rField_is_Ring(r));
   const coeffs C = r->cf;
 
@@ -2944 +2923 @@
   number d, h;
 
-  if (rField_is_Ring(r)) /*should not be called*/
+  if (rField_is_Ring(r))
+  {
+    p_ContentForGB(p,r);
+    if(!n_GreaterZero(pGetCoeff(p),C)) p = p_Neg(p,r);
+    return p;
+  }
+
+  if (rField_is_Zp(r) && TEST_OPT_INTSTRATEGY)
   {
     if(!n_GreaterZero(pGetCoeff(p),C)) p = p_Neg(p,r);
@@ -3067 +3053 @@
 #endif
 
-  if (rField_is_Ring(r)) /*should not be called*/
-  {
-    if(!n_GreaterZero(pGetCoeff(ph),C))
-    {
-      ph = p_Neg(ph,r);
-      c=n_Init(-1,C);
-    }
-    else
-      c=n_Init(1,C);
-    return;
-  }
 
   if( pNext(p) == NULL )
@@ -3130 +3105 @@
   }
 #endif
+
+
+
 
   if(1)
@@ -3821 +3799 @@
   {
     if(!n_GreaterZero(pGetCoeff(p1),r->cf)) p1 = p_Neg(p1,r);
-    //p_ContentForGB(p1,r);
+    if (!n_IsUnit(pGetCoeff(p1), r->cf)) return;
+    // Werror("p_Norm not possible in the case of coefficient rings.");
   }
   else if (p1!=NULL)
@@ -3844 +3823 @@
         // normalize already in nDiv: Q_a, Z/p_a
         // remains: Q
-        if (rField_is_Q(r)) n_Normalize(c,r->cf);
+        if (rField_is_Q(r) && (!n_IsOne(c,r->cf))) n_Normalize(c,r->cf);
         p_SetCoeff(h,c,r);
         pIter(h);