Changeset 7b8e28f in git

Timestamp:

Mar 12, 2021, 12:55:50 PM (2 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

0dd7e8bafbd1f4c71feb76c0c887ba2fbbc66ef7

Parents:

24457e03b41762fa464203e9f37e01f02fce2468

Message:

fix: Singular.j power error (#386)

File:

• libpolys/coeffs/ffields.cc (modified) (3 diffs)

libpolys/coeffs/ffields.cc

@@ -858 +858 @@
 BOOLEAN nfInitChar(coeffs r,  void * parameter)
 {
+  // the variables:
+  assume( getCoeffType(r) == n_GF );
+
+  GFInfo* p = (GFInfo *)(parameter);
+  assume (p->GFChar > 0);
+  assume (p->GFDegree > 0);
+  if ((IsPrime(p->GFChar)==p->GFChar)&&(p->GFDegree==1)) /* for oscar-system/Singular.jl/issues/177 */
+  {
+    return npInitChar(r,(void*)(long)p->GFChar);
+  }
+  if(p->GFChar > (2<<15))
+  {
+#ifndef SING_NDEBUG
+    WarnS("illegal characteristic");
+#endif
+    return TRUE;
+  }
+
+  const double check= log ((double) (p->GFChar));
+
+  #define sixteenlog2 11.09035489
+  if( (p->GFDegree * check) > sixteenlog2 )
+  {
+#ifndef SING_NDEBUG
+    Warn("Sorry: illegal size: %u ^ %u", p->GFChar, p->GFDegree );
+#endif
+    return TRUE;
+  }
+
   r->is_field=TRUE;
   r->is_domain=TRUE;
@@ -915 +944 @@
 #endif
 
-  // the variables:
-  assume( getCoeffType(r) == n_GF );
-
-  GFInfo* p = (GFInfo *)(parameter);
-  assume (p->GFChar > 0);
-  assume (p->GFDegree > 0);
 
   const char * name = p->GFPar_name;
@@ -948 +971 @@
   r->has_simple_Inverse=TRUE;
 
-  if ((IsPrime(p->GFChar)==p->GFChar)&&(p->GFDegree==1)) /* for oscar-system/Singular.jl/issues/177 */
-  {
-    return npInitChar(r,(void*)(long)p->GFChar);
-  }
-  if(p->GFChar > (2<<15))
-  {
-#ifndef SING_NDEBUG
-    WarnS("illegal characteristic");
-#endif
-    return TRUE;
-  }
-
-  const double check= log ((double) (p->GFChar));
-
-  #define sixteenlog2 11.09035489
-  if( (p->GFDegree * check) > sixteenlog2 )
-  {
-#ifndef SING_NDEBUG
-    Warn("Sorry: illegal size: %u ^ %u", p->GFChar, p->GFDegree );
-#endif
-    return TRUE;
-  }
-
   int c = (int)pow ((double)p->GFChar, (double)p->GFDegree);