Changeset a55ef0 in git


Ignore:
Timestamp:
Sep 14, 2011, 6:58:57 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'c1c65551e4b3a0de0b13ddf30446f6e9569681b5')
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:
2 edited

Legend:

Unmodified
Added
Removed
  • libpolys/polys/ext_fields/algext.cc

    r047597 ra55ef0  
    256256void naCoeffWrite(const coeffs cf)
    257257{
    258   char *x = rRingVar(0, naRing);
     258  assume( cf != NULL );
     259 
     260  const ring A = cf->extRing;
     261 
     262  assume( A != NULL );
     263  assume( A->cf != NULL );
     264   
     265  n_CoeffWrite(A->cf);
     266 
     267//  rWrite(A);
     268 
     269  const int P = rVar(A);
     270  assume( P > 0 );
     271 
     272  Print("//   %d parameter    : ", P);
     273 
     274  for (int nop=0; nop < P; nop ++)
     275    Print("%s ", rRingVar(nop, A));
     276 
     277  const ideal I = A->minideal;
     278
     279  assume( I != NULL );
     280  assume( IDELEMS(I) == 1 );
     281 
     282  PrintS("\n//   minpoly        : ("); p_Write0( I->m[0], A); PrintS(")\n");
     283 
     284/*
     285  char *x = rRingVar(0, A);
     286
    259287  Print("//   Coefficients live in the extension field K[%s]/<f(%s)>\n", x, x);
    260288  Print("//   with the minimal polynomial f(%s) = %s\n", x,
    261         p_String(naMinpoly, naRing));
    262   PrintS("//   and K: "); n_CoeffWrite(cf->extRing->cf);
     289        p_String(A->minideal->m[0], A));
     290  PrintS("//   and K: ");
     291*/
    263292}
    264293
     
    622651BOOLEAN naInitChar(coeffs cf, void * infoStruct)
    623652
     653  assume( cf != NULL );
     654  assume( infoStruct != NULL );
     655
    624656  AlgExtInfo *e = (AlgExtInfo *)infoStruct;
    625657  /// first check whether cf->extRing != NULL and delete old ring???
  • libpolys/polys/ext_fields/transext.cc

    r047597 ra55ef0  
    370370void ntCoeffWrite(const coeffs cf)
    371371{
     372  assume( cf != NULL );
     373
     374  const ring A = cf->extRing;
     375
     376  assume( A != NULL );
     377  assume( A->cf != NULL );
     378
     379  n_CoeffWrite(A->cf);
     380
     381//  rWrite(A);
     382
     383  const int P = rVar(A);
     384  assume( P > 0 );
     385 
     386  Print("//   %d parameter    : ", P);
     387 
     388  for (int nop=0; nop < P; nop ++)
     389    Print("%s ", rRingVar(nop, A));
     390
     391  assume( A->minideal == NULL );
     392 
     393  PrintS("\n//   minpoly        : 0\n");
     394
     395
     396/*
    372397  PrintS("//   Coefficients live in the rational function field\n");
    373398  Print("//   K(");
    374399  for (int i = 0; i < rVar(ntRing); i++)
    375400  {
    376     if (i > 0) PrintS(", ");
     401    if (i > 0) PrintS(" ");
    377402    Print("%s", rRingVar(i, ntRing));
    378403  }
    379404  PrintS(") with\n");
    380405  PrintS("//   K: "); n_CoeffWrite(cf->extRing->cf);
     406*/
    381407}
    382408
     
    10711097
    10721098BOOLEAN ntInitChar(coeffs cf, void * infoStruct)
    1073 
     1099{
     1100
     1101  assume( cf != NULL );
     1102  assume( infoStruct != NULL );
     1103 
    10741104  TransExtInfo *e = (TransExtInfo *)infoStruct;
    10751105  /// first check whether cf->extRing != NULL and delete old ring???
Note: See TracChangeset for help on using the changeset viewer.