Changeset 7a5d05 in git


Ignore:
Timestamp:
Apr 16, 2015, 2:00:21 PM (9 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')
Children:
1b7bc4cdfc3efa77d24a9245038005aba1b0df36
Parents:
e523f3501b57e41faeb3688cbe5daa7373cf1408
Message:
fix: move references to k_NF in libpolys to r->NF (windows port)
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • Singular/ipshell.cc

    re523f3 r7a5d05  
    22712271
    22722272  ring R = (ring) omAlloc0Bin(sip_sring_bin);
     2273  R->NF=k_NF;
    22732274
    22742275
    … …  
    53195320  // allocated ring
    53205321  R = (ring) omAlloc0Bin(sip_sring_bin);
     5322  R->NF=k_NF;
    53215323
    53225324  coeffs cf = NULL;
    … …  
    53875389        TransExtInfo extParam;
    53885390
    5389         extParam.r = rDefault( ch, pars, names); // Q/Zp [ p_1, ... p_pars ]
     5391        extParam.r = rDefault( ch, pars, names, k_NF); // Q/Zp [ p_1, ... p_pars ]
    53905392        for(int i=pars-1; i>=0;i--)
    53915393        {

  • Singular/test.cc

    re523f3 r7a5d05  
    353353  // changing a ring for the interpreter
    354354  // re-using n and R from above
    355   ring R = rDefault(32003, 3, n);
     355  ring R = rDefault(32003, 3, n,k_NF);
    356356  idhdl newRingHdl=enterid("R" /* ring name*/,
    357357                           0, /*nesting level, 0=global*/

  • Singular/walk.cc

    re523f3 r7a5d05  
    22882288
    22892289  ring r = (ring) omAlloc0Bin(sip_sring_bin);
     2290  r->NF = currRing->NF;
    22902291  int i, nv = currRing->N;
    22912292
    … …  
    23702371
    23712372  ring r = (ring) omAlloc0Bin(sip_sring_bin);
     2373  r->NF = currRing->NF;
    23722374  int i, nv = currRing->N;
    23732375
    … …  
    24402442
    24412443  ring r = (ring) omAlloc0Bin(sip_sring_bin);
     2444  r->NF = currRing->NF;
    24422445  int i, nv = currRing->N;
    24432446
    … …  
    25152518
    25162519  ring r = (ring) omAlloc0Bin(sip_sring_bin);
     2520  r->NF = currRing->NF;
    25172521  int i, nv = currRing->N;
    25182522
    … …  
    25982602
    25992603  ring r = (ring) omAlloc0Bin(sip_sring_bin);
     2604  r->NF = currRing->NF;
    26002605  int i, nv = currRing->N;
    26012606
    … …  
    26762681
    26772682  ring r = (ring) omAlloc0Bin(sip_sring_bin);
     2683  r->NF = currRing->NF;
    26782684  int i, nv = currRing->N;
    26792685  int nvs = nv*nv;
    … …  
    27592765
    27602766  ring r = (ring) omAlloc0Bin(sip_sring_bin);
     2767  r->NF = currRing->NF;
    27612768  int i, nv = currRing->N;
    27622769

  • kernel/GBEngine/test.cc

    re523f3 r7a5d05  
    425425  n[2]=omStrDup("z2");
    426426
    427   ring R = rDefault(32003,3,n); //  ring R = rDefault(0,3,n);
     427  ring R = rDefault(32003,3,n,k_NF); //  ring R = rDefault(0,3,n);
    428428
    429429  rWrite(R); PrintLn();

  • kernel/test.cc

    re523f3 r7a5d05  
    536536  n[2]=omStrDup("z2");
    537537
    538   ring R = rDefault(32003,3,n); //  ring R = rDefault(0,3,n);
     538  ring R = rDefault(32003,3,n,k_NF); //  ring R = rDefault(0,3,n);
    539539
    540540  rWrite(R); PrintLn();

  • libpolys/polys/monomials/ring.cc

    re523f3 r7a5d05  
    146146  return rDefault(cf,N,n,ord_size,ord,block0,block1,wvhdl);
    147147}
    148 ring   rDefault(const coeffs cf, int N, char **n)
     148ring   rDefault(const coeffs cf, int N, char **n, const NF_Proc NF)
    149149{
    150150  assume( cf != NULL);
    … …  
    160160  order[1]  = 0;
    161161
    162   return rDefault(cf,N,n,2,order,block0,block1);
    163 }
    164 
    165 ring rDefault(int ch, int N, char **n)
     162  ring r= rDefault(cf,N,n,2,order,block0,block1);
     163  r->NF=NF;
     164  return r;
     165}
     166
     167ring rDefault(int ch, int N, char **n, const NF_Proc NF)
    166168{
    167169  coeffs cf;
    … …  
    169171  else       cf=nInitChar(n_Zp,(void*)(long)ch);
    170172  assume( cf != NULL);
    171   return rDefault(cf,N,n);
     173  return rDefault(cf,N,n,NF);
    172174}
    173175
    … …  
    13031305  res->N=rVar(r);      /* number of vars */
    13041306  res->OrdSgn=r->OrdSgn; /* 1 for polynomial rings, -1 otherwise */
     1307  res->NF=r->NF;
    13051308
    13061309  res->firstBlockEnds=r->firstBlockEnds;
    … …  
    33953398  return FALSE;
    33963399}
     3400static poly rNF_Dummy(ideal, ideal, poly, int, int, const ring _currRing)
     3401{
     3402  WerrorS("NF not defined"); return NULL;
     3403}
    33973404
    33983405BOOLEAN rComplete(ring r, int force)
    33993406{
    34003407  if (r->VarOffset!=NULL && force == 0) return FALSE;
     3408  if (r->NF==NULL) r->NF=rNF_Dummy;
    34013409  rSetOutParams(r);
    34023410  int n=rBlocks(r)-1;

  • libpolys/polys/monomials/ring.h

    re523f3 r7a5d05  
    201201#endif
    202202
     203typedef poly (*NF_Proc)(ideal, ideal, poly, int, int, const ring _currRing);
     204
    203205struct ip_sring
    204206{
    … …  
    251253//   mpz_ptr    cf->modNumber;
    252254// #endif
     255
     256  NF_Proc  NF; /* unused for commutative rings
     257                * for noncommutative qrings R/I:
     258                *    the k_NF of the corresponding R
     259                */
    253260
    254261  unsigned long options; /* ring dependent options */
    … …  
    337344/////// void   rChangeCurrRing(ring r);
    338345
    339 ring   rDefault(int ch, int N, char **n);
    340 ring   rDefault(const coeffs cf, int N, char **n);
     346// NF must be given as k_NF or equivalent for PLURAL rings:
     347ring   rDefault(int ch, int N, char **n, const NF_Proc NF=NULL);
     348ring   rDefault(const coeffs cf, int N, char **n, const NF_Proc NF=NULL);
    341349ring   rDefault(int ch, int N, char **n,int ord_size, int *ord, int *block0, int *block1, int **wvhdl=NULL);
    342350ring   rDefault(const coeffs cf, int N, char **n,int ord_size, int *ord, int *block0, int *block1, int **wvhdl=NULL);

  • libpolys/polys/nc/gb_hack.h

    re523f3 r7a5d05  
    2828ideal sca_mora(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing);
    2929
    30 poly k_NF(ideal, ideal, poly, int, int, const ring _currRing);
    31 
    3230
    3331
    … …  
    5149D(ideal sca_mora(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing))
    5250
    53 D(poly k_NF(ideal, ideal, poly, int, int, const ring _currRing))
    54 
    5551#endif // # ifdef PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    5652#endif // PLURAL_INTERNAL_DECLARATIONS

  • libpolys/polys/nc/nc.h

    re523f3 r7a5d05  
    2929  nc_exterior /*5*/ // Exterior Algebra(SCA): yx= -xy & (!:) x^2 = 0
    3030};
     31
    3132
    3233

  • libpolys/polys/nc/sca.cc

    re523f3 r7a5d05  
    11181118      // square = NF( var(i)^2 | Q )
    11191119      // NOTE: there is no better way to check this in general!
    1120       square = k_NF(idQuotient, NULL, square, 0, 1, rG); // must ran in currRing == rG!
     1120      square = rG->NF(idQuotient, NULL, square, 0, 1, rG); // must ran in currRing == rG!
    11211121
    11221122      if( square != NULL ) // var(i)^2 is not in Q?
Note: See TracChangeset for help on using the changeset viewer.