Changeset a55ef0 in git

Timestamp:

Sep 14, 2011, 6:58:57 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '0604212ebb110535022efecad887940825b97c3f')

Children:

e209100ba5f79c94ecb471edc913f70d78a3c0cb

Parents:

04759787eb1aa29f19cdfe61219edb878dc6db6b

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-09-14 18:58:57+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 16:12:48+01:00

Message:

FIX: output the Frank's extension fields in the old Singular way (in order to avoid changing the testsuite result)

Location:

libpolys/polys/ext_fields

Files:

• algext.cc (modified) (2 diffs)
• transext.cc (modified) (2 diffs)

libpolys/polys/ext_fields/algext.cc

@@ -256 +256 @@
 void naCoeffWrite(const coeffs cf)
 {
-  char *x = rRingVar(0, naRing);
+  assume( cf != NULL );
+  
+  const ring A = cf->extRing;
+  
+  assume( A != NULL );
+  assume( A->cf != NULL );
+   
+  n_CoeffWrite(A->cf);
+ 
+//  rWrite(A);
+  
+  const int P = rVar(A);
+  assume( P > 0 );
+  
+  Print("//   %d parameter    : ", P);
+  
+  for (int nop=0; nop < P; nop ++)
+    Print("%s ", rRingVar(nop, A));
+  
+  const ideal I = A->minideal;
+
+  assume( I != NULL );
+  assume( IDELEMS(I) == 1 );
+  
+  PrintS("\n//   minpoly        : ("); p_Write0( I->m[0], A); PrintS(")\n");
+  
+/*
+  char *x = rRingVar(0, A);
+
   Print("//   Coefficients live in the extension field K[%s]/<f(%s)>\n", x, x);
   Print("//   with the minimal polynomial f(%s) = %s\n", x,
-        p_String(naMinpoly, naRing));
-  PrintS("//   and K: "); n_CoeffWrite(cf->extRing->cf);
+        p_String(A->minideal->m[0], A));
+  PrintS("//   and K: ");
+*/
 }
 
@@ -622 +651 @@
 BOOLEAN naInitChar(coeffs cf, void * infoStruct)
 {  
+  assume( cf != NULL );
+  assume( infoStruct != NULL );
+
   AlgExtInfo *e = (AlgExtInfo *)infoStruct;
   /// first check whether cf->extRing != NULL and delete old ring???

libpolys/polys/ext_fields/transext.cc

@@ -370 +370 @@
 void ntCoeffWrite(const coeffs cf)
 {
+  assume( cf != NULL );
+
+  const ring A = cf->extRing;
+
+  assume( A != NULL );
+  assume( A->cf != NULL );
+
+  n_CoeffWrite(A->cf);
+
+//  rWrite(A);
+
+  const int P = rVar(A);
+  assume( P > 0 );
+  
+  Print("//   %d parameter    : ", P);
+  
+  for (int nop=0; nop < P; nop ++)
+    Print("%s ", rRingVar(nop, A));
+
+  assume( A->minideal == NULL );
+  
+  PrintS("\n//   minpoly        : 0\n");
+
+
+/*
   PrintS("//   Coefficients live in the rational function field\n");
   Print("//   K(");
   for (int i = 0; i < rVar(ntRing); i++)
   {
-    if (i > 0) PrintS(", ");
+    if (i > 0) PrintS(" ");
     Print("%s", rRingVar(i, ntRing));
   }
   PrintS(") with\n");
   PrintS("//   K: "); n_CoeffWrite(cf->extRing->cf);
+*/
 }
 
@@ -1071 +1097 @@
 
 BOOLEAN ntInitChar(coeffs cf, void * infoStruct)
-{  
+{
+
+  assume( cf != NULL );
+  assume( infoStruct != NULL );
+  
   TransExtInfo *e = (TransExtInfo *)infoStruct;
   /// first check whether cf->extRing != NULL and delete old ring???