Changeset 2dac63 in git

Timestamp:

Jul 21, 2021, 10:42:36 PM (3 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6fcc76c21a327463abe6861bd1dfc1e50d337b16

Parents:

3028b1af3cce625ab8f0a52d2573c868e76f17f0

Message:

rChar -> rInternalChar

Files:

• Singular/fglm.cc (modified) (1 diff)
• kernel/groebner_walk/walkProc.cc (modified) (1 diff)
• libpolys/polys/clapsing.cc (modified) (24 diffs)
• libpolys/polys/monomials/p_polys.cc (modified) (1 diff)

Singular/fglm.cc

@@ -124 +124 @@
     FglmState state= FglmOk;
 
-    if ( rChar(sring) != rChar(dring) )
+    if ( sring->cf != dring->cf )
     {
         WerrorS( "rings must have same characteristic" );

kernel/groebner_walk/walkProc.cc

@@ -56 +56 @@
     WalkState state= WalkOk;
 
-    if ( rChar(sring) != rChar(dring) )
+    if ( sring->cf != dring->cf )
     {
         WerrorS( "rings must have same characteristic" );

libpolys/polys/clapsing.cc

@@ -87 +87 @@
   || (rField_is_Zn(r)&&(r->cf->convSingNFactoryN!=ndConvSingNFactoryN)))
   {
-    setCharacteristic( rChar(r) );
+    setCharacteristic( rInternalChar(r) );
     CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g, r ) );
     res=convFactoryPSingP( gcd( F, G ) , r);
@@ -99 +99 @@
   {
     if ( rField_is_Q_a(r)) setCharacteristic( 0 );
-    else                   setCharacteristic( rChar(r) );
+    else                   setCharacteristic( rInternalChar(r) );
     if (r->cf->extRing->qideal!=NULL)
     {
@@ -126 +126 @@
   else
   { // handle user type coeffs:
-    setCharacteristic( rChar(r) );
+    setCharacteristic( rInternalChar(r) );
     CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g, r ) );
     res=convFactoryPSingP( gcd( F, G ) , r);
@@ -179 +179 @@
   {
     bool b1=isOn(SW_USE_EZGCD_P);
-    setCharacteristic( rChar(r) );
+    setCharacteristic( rInternalChar(r) );
     F=convSingPFactoryP( f,r );
     G=convSingPFactoryP( g,r );
@@ -215 +215 @@
   {
     if ( rField_is_Q_a(r)) setCharacteristic( 0 );
-    else                   setCharacteristic( rChar(r) );
+    else                   setCharacteristic( rInternalChar(r) );
     if (r->cf->extRing->qideal!=NULL)
     {
@@ -326 +326 @@
   {
     Variable X(i);
-    setCharacteristic( rChar(r) );
+    setCharacteristic( rInternalChar(r) );
     CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g,r ) );
     res=convFactoryPSingP( resultant( F, G, X),r );
@@ -336 +336 @@
   {
     if (rField_is_Q_a(r)) setCharacteristic( 0 );
-    else               setCharacteristic( rChar(r) );
+    else               setCharacteristic( rInternalChar(r) );
     Variable X(i+rPar(r));
     if (r->cf->extRing->qideal!=NULL)
@@ -463 +463 @@
   || (rField_is_Zn(r)&&(r->cf->convSingNFactoryN!=ndConvSingNFactoryN)))
   {
-    setCharacteristic( rChar(r) );
+    setCharacteristic( rInternalChar(r) );
     CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g,r) );
     CanonicalForm FpG=F+G;
@@ -484 +484 @@
   {
     if (rField_is_Q_a(r)) setCharacteristic( 0 );
-    else                 setCharacteristic( rChar(r) );
+    else                 setCharacteristic( rInternalChar(r) );
     CanonicalForm Fa,Gb;
     if (r->cf->extRing->qideal!=NULL)
@@ -549 +549 @@
   {
     if (rField_is_Z(r)) Off(SW_RATIONAL);
-    setCharacteristic( rChar(r) );
+    setCharacteristic( rInternalChar(r) );
     CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g,r ) );
     res = convFactoryPSingP( F * G,r );
@@ -556 +556 @@
   {
     if (rField_is_Q_a(r)) setCharacteristic( 0 );
-    else               setCharacteristic( rChar(r) );
+    else               setCharacteristic( rInternalChar(r) );
     if (r->cf->extRing->qideal!=NULL)
     {
@@ -626 +626 @@
   || (rField_is_Zn(r)&&(r->cf->convSingNFactoryN!=ndConvSingNFactoryN)))
   {
-    setCharacteristic( rChar(r) );
+    setCharacteristic( rInternalChar(r) );
     CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g,r ) );
     res = convFactoryPSingP( F / G,r );
@@ -634 +634 @@
   {
     if (rField_is_Q_a(r)) setCharacteristic( 0 );
-    else               setCharacteristic( rChar(r) );
+    else               setCharacteristic( rInternalChar(r) );
     if (r->cf->extRing->qideal!=NULL)
     {
@@ -673 +673 @@
   || (rField_is_Zn(r)&&(r->cf->convSingNFactoryN!=ndConvSingNFactoryN)))
   {
-    setCharacteristic( rChar(r) );
+    setCharacteristic( rInternalChar(r) );
     CanonicalForm F( convSingPFactoryP( f,r ) ), G( convSingPFactoryP( g,r ) );
     CanonicalForm Q,R;
@@ -684 +684 @@
   {
     if (rField_is_Q_a(r)) setCharacteristic( 0 );
-    else               setCharacteristic( rChar(r) );
+    else               setCharacteristic( rInternalChar(r) );
     if (r->cf->extRing->qideal!=NULL)
     {
@@ -1038 +1038 @@
     if (rField_is_Q(r) || rField_is_Zp(r) || rField_is_Z(r) || rField_is_Zn(r))
     {
-      setCharacteristic( rChar(r) );
+      setCharacteristic( rInternalChar(r) );
       if (errorreported) goto notImpl; // char too large
       CanonicalForm F( convSingPFactoryP( f,r ) );
@@ -1047 +1047 @@
     {
       if (rField_is_Q_a (r)) setCharacteristic (0);
-      else                   setCharacteristic( rChar(r) );
+      else                   setCharacteristic( rInternalChar(r) );
       if (errorreported) goto notImpl; // char too large
       if (r->cf->extRing->qideal!=NULL) /*algebraic extension */
@@ -1414 +1414 @@
   || (rField_is_Zn(r)&&(r->cf->convSingNFactoryN!=ndConvSingNFactoryN)))
   {
-    setCharacteristic( rChar(r) );
+    setCharacteristic( rInternalChar(r) );
     CanonicalForm F( convSingPFactoryP( f,r ) );
     L = sqrFree( F );
@@ -1421 +1421 @@
   {
     if (rField_is_Q_a (r)) setCharacteristic (0);
-    else                   setCharacteristic( rChar(r) );
+    else                   setCharacteristic( rInternalChar(r) );
     if (r->cf->extRing->qideal!=NULL)
     {
@@ -1439 +1439 @@
   else if (rField_is_GF())
   {
-    int c=rChar(r);
+    int c=rInternalChar(r);
     setCharacteristic( c, primepower(c) );
     CanonicalForm F( convSingGFFactoryGF( f ) );
@@ -1550 +1550 @@
   || (rField_is_Zn(r)&&(r->cf->convSingNFactoryN!=ndConvSingNFactoryN)))
   {
-    setCharacteristic( rChar(r) );
+    setCharacteristic( rInternalChar(r) );
     for(i=0;i<IDELEMS(I);i++)
     {
@@ -1566 +1566 @@
   else if (nCoeff_is_transExt (r->cf))
   {
-    setCharacteristic( rChar(r) );
+    setCharacteristic( rInternalChar(r) );
     for(i=0;i<IDELEMS(I);i++)
     {
@@ -1637 +1637 @@
   || (rField_is_Zn(r)&&(r->cf->convSingNFactoryN!=ndConvSingNFactoryN)))
   {
-    setCharacteristic( rChar(r) );
+    setCharacteristic( rInternalChar(r) );
     for(i=0;i<IDELEMS(I);i++)
     {
@@ -1652 +1652 @@
   else if (nCoeff_is_transExt (r->cf))
   {
-    setCharacteristic( rChar(r) );
+    setCharacteristic( rInternalChar(r) );
     for(i=0;i<IDELEMS(I);i++)
     {

libpolys/polys/monomials/p_polys.cc

@@ -2244 +2244 @@
             return p_MonPower(p,i,r);
           /* else: binom ?*/
-          int char_p=rChar(r);
+          int char_p=rInternalChar(r);
           if ((char_p>0) && (i>char_p)
           && ((rField_is_Zp(r,char_p)