Changeset 1b7bc4 in git


Ignore:
Timestamp:
Apr 16, 2015, 3:01:19 PM (8 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
7203f75e9a4e317e9e009db8a853ed8c0e6be635
Parents:
7a5d0528fc222efce1f1e6ada3f0ba8e3ad513c3
Message:
Revert "fix: move references to k_NF in libpolys to r->NF (windows port)"

This reverts commit 7a5d0528fc222efce1f1e6ada3f0ba8e3ad513c3.
Files:
10 edited

Legend:

Unmodified
Added
Removed

  • Singular/ipshell.cc

    r7a5d05 r1b7bc4  
    22712271
    22722272  ring R = (ring) omAlloc0Bin(sip_sring_bin);
    2273   R->NF=k_NF;
    22742273
    22752274
    … …  
    53205319  // allocated ring
    53215320  R = (ring) omAlloc0Bin(sip_sring_bin);
    5322   R->NF=k_NF;
    53235321
    53245322  coeffs cf = NULL;
    … …  
    53895387        TransExtInfo extParam;
    53905388
    5391         extParam.r = rDefault( ch, pars, names, k_NF); // Q/Zp [ p_1, ... p_pars ]
     5389        extParam.r = rDefault( ch, pars, names); // Q/Zp [ p_1, ... p_pars ]
    53925390        for(int i=pars-1; i>=0;i--)
    53935391        {

  • Singular/test.cc

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

  • Singular/walk.cc

    r7a5d05 r1b7bc4  
    22882288
    22892289  ring r = (ring) omAlloc0Bin(sip_sring_bin);
    2290   r->NF = currRing->NF;
    22912290  int i, nv = currRing->N;
    22922291
    … …  
    23712370
    23722371  ring r = (ring) omAlloc0Bin(sip_sring_bin);
    2373   r->NF = currRing->NF;
    23742372  int i, nv = currRing->N;
    23752373
    … …  
    24422440
    24432441  ring r = (ring) omAlloc0Bin(sip_sring_bin);
    2444   r->NF = currRing->NF;
    24452442  int i, nv = currRing->N;
    24462443
    … …  
    25182515
    25192516  ring r = (ring) omAlloc0Bin(sip_sring_bin);
    2520   r->NF = currRing->NF;
    25212517  int i, nv = currRing->N;
    25222518
    … …  
    26022598
    26032599  ring r = (ring) omAlloc0Bin(sip_sring_bin);
    2604   r->NF = currRing->NF;
    26052600  int i, nv = currRing->N;
    26062601
    … …  
    26812676
    26822677  ring r = (ring) omAlloc0Bin(sip_sring_bin);
    2683   r->NF = currRing->NF;
    26842678  int i, nv = currRing->N;
    26852679  int nvs = nv*nv;
    … …  
    27652759
    27662760  ring r = (ring) omAlloc0Bin(sip_sring_bin);
    2767   r->NF = currRing->NF;
    27682761  int i, nv = currRing->N;
    27692762

  • kernel/GBEngine/test.cc

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

  • kernel/test.cc

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

  • libpolys/polys/monomials/ring.cc

    r7a5d05 r1b7bc4  
    146146  return rDefault(cf,N,n,ord_size,ord,block0,block1,wvhdl);
    147147}
    148 ring   rDefault(const coeffs cf, int N, char **n, const NF_Proc NF)
     148ring   rDefault(const coeffs cf, int N, char **n)
    149149{
    150150  assume( cf != NULL);
    … …  
    160160  order[1]  = 0;
    161161
    162   ring r= rDefault(cf,N,n,2,order,block0,block1);
    163   r->NF=NF;
    164   return r;
    165 }
    166 
    167 ring rDefault(int ch, int N, char **n, const NF_Proc NF)
     162  return rDefault(cf,N,n,2,order,block0,block1);
     163}
     164
     165ring rDefault(int ch, int N, char **n)
    168166{
    169167  coeffs cf;
    … …  
    171169  else       cf=nInitChar(n_Zp,(void*)(long)ch);
    172170  assume( cf != NULL);
    173   return rDefault(cf,N,n,NF);
     171  return rDefault(cf,N,n);
    174172}
    175173
    … …  
    13051303  res->N=rVar(r);      /* number of vars */
    13061304  res->OrdSgn=r->OrdSgn; /* 1 for polynomial rings, -1 otherwise */
    1307   res->NF=r->NF;
    13081305
    13091306  res->firstBlockEnds=r->firstBlockEnds;
    … …  
    33983395  return FALSE;
    33993396}
    3400 static poly rNF_Dummy(ideal, ideal, poly, int, int, const ring _currRing)
    3401 {
    3402   WerrorS("NF not defined"); return NULL;
    3403 }
    34043397
    34053398BOOLEAN rComplete(ring r, int force)
    34063399{
    34073400  if (r->VarOffset!=NULL && force == 0) return FALSE;
    3408   if (r->NF==NULL) r->NF=rNF_Dummy;
    34093401  rSetOutParams(r);
    34103402  int n=rBlocks(r)-1;

  • libpolys/polys/monomials/ring.h

    r7a5d05 r1b7bc4  
    201201#endif
    202202
    203 typedef poly (*NF_Proc)(ideal, ideal, poly, int, int, const ring _currRing);
    204 
    205203struct ip_sring
    206204{
    … …  
    253251//   mpz_ptr    cf->modNumber;
    254252// #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                 */
    260253
    261254  unsigned long options; /* ring dependent options */
    … …  
    344337/////// void   rChangeCurrRing(ring r);
    345338
    346 // NF must be given as k_NF or equivalent for PLURAL rings:
    347 ring   rDefault(int ch, int N, char **n, const NF_Proc NF=NULL);
    348 ring   rDefault(const coeffs cf, int N, char **n, const NF_Proc NF=NULL);
     339ring   rDefault(int ch, int N, char **n);
     340ring   rDefault(const coeffs cf, int N, char **n);
    349341ring   rDefault(int ch, int N, char **n,int ord_size, int *ord, int *block0, int *block1, int **wvhdl=NULL);
    350342ring   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

    r7a5d05 r1b7bc4  
    2828ideal sca_mora(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing);
    2929
     30poly k_NF(ideal, ideal, poly, int, int, const ring _currRing);
     31
    3032
    3133
    … …  
    4951D(ideal sca_mora(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing))
    5052
     53D(poly k_NF(ideal, ideal, poly, int, int, const ring _currRing))
     54
    5155#endif // # ifdef PLURAL_INTERNAL_DECLARATIONS_GB_HACK
    5256#endif // PLURAL_INTERNAL_DECLARATIONS

  • libpolys/polys/nc/nc.h

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

  • libpolys/polys/nc/sca.cc

    r7a5d05 r1b7bc4  
    11181118      // square = NF( var(i)^2 | Q )
    11191119      // NOTE: there is no better way to check this in general!
    1120       square = rG->NF(idQuotient, NULL, square, 0, 1, rG); // must ran in currRing == rG!
     1120      square = k_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.