Changeset 24d28c in git


Ignore:
Timestamp:
Jul 19, 2013, 2:59:19 PM (10 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
5b6807c5be64d7eb424e7d933a00f8cbb137d50c
Parents:
2b2e08e9ac466fdf41a00e09569fbe1ea27db681
Message:
chg: comments for ro_* enum
File:
1 edited

Legend:

Unmodified
Added
Removed
  • libpolys/polys/monomials/ring.h

    r2b2e08 r24d28c  
    5151/// returns a poly from dest_r which is a ShallowCopy of s_p from source_r
    5252/// assumes that source_r->N == dest_r->N and that orderings are the same
    53 typedef poly (*pShallowCopyDeleteProc)(poly s_p, ring source_r, ring dest_r, 
     53typedef poly (*pShallowCopyDeleteProc)(poly s_p, ring source_r, ring dest_r,
    5454                                       omBin dest_bin);
    5555
    56 
     56// ro_typ describes what to store at the corresping "data" place in p->exp
     57// none of the directly corresponds to a ring ordering (ringorder_*)
     58// as each ringorder_* blocks corrsponds to 0..2 sro-blocks
    5759typedef enum
    5860{
    59   ro_dp, // ordering is a degree ordering
    60   ro_wp, // ordering is a weighted degree ordering
    61   ro_am, // ordering is am: weights for vars + weights for gen
    62   ro_wp64, // ordering is a weighted64 degree ordering
    63   ro_wp_neg, // ordering is a weighted degree ordering
    64              // with possibly negative weights
    65   ro_cp,    // ordering duplicates variables
    66   ro_syzcomp, // ordering indicates "subset" of component number (ringorder_S)
    67   ro_syz, // ordering  with component number >syzcomp is lower (ringorder_s)
    68   ro_isTemp, ro_is, // Induced Syzygy (Schreyer) ordering (and prefix data placeholder dummy) (ringorder_IS)
     61  ro_dp, // total degree with weights 1
     62  ro_wp, // total weighted degree with weights>0 in wvhdl
     63  ro_am, // weights for vars + weights for gen
     64  ro_wp64, // weighted64 degree weights in wvhdl
     65  ro_wp_neg, // total weighted degree with weights in Z in wvhdl
     66             // (with possibly negative weights)
     67  ro_cp,    // ??ordering duplicates variables
     68  ro_syzcomp, // ??ordering indicates "subset" of component number (ringorder_S)
     69  ro_syz, // component number if <=syzcomp else 0 (ringorder_s)
     70  ro_isTemp, ro_is, // ??Induced Syzygy (Schreyer) ordering (and prefix data placeholder dummy) (ringorder_IS)
    6971  ro_none
    7072}
     
    101103  int *weights_m; // pointers into wvhdl field of length len_gen + 1
    102104                // len_gen, mod_w_1, .. mod_w_len, 0
    103  
     105
    104106};
    105107typedef struct sro_am sro_am;
     
    250252//   int_number    cf->modNumber;
    251253// #endif
    252  
     254
    253255  unsigned long options; /* ring dependent options */
    254256
     
    354356static inline bool rIsPluralRing(const ring r)
    355357{
    356   assume(r != NULL); assume(r->cf != NULL);   
     358  assume(r != NULL); assume(r->cf != NULL);
    357359#ifdef HAVE_PLURAL
    358360  nc_struct *n;
     
    478480static inline BOOLEAN rField_is_Q_a(const ring r)
    479481{ assume(r != NULL); assume(r->cf != NULL); return nCoeff_is_Q_a(r->cf); }
    480    
     482
    481483static inline BOOLEAN rField_is_long_R(const ring r)
    482484{ assume(r != NULL); assume(r->cf != NULL); return nCoeff_is_long_R(r->cf); }
     
    492494{ assume(r != NULL); assume(r->cf != NULL); return nCoeff_has_simple_Alloc(r->cf); }
    493495
    494 /// Alg. or trans. ext. 
     496/// Alg. or trans. ext.
    495497static inline BOOLEAN rField_is_Extension(const ring r)
    496498{ assume(r != NULL); assume(r->cf != NULL); return nCoeff_is_Extension(r->cf); } /* Z/p(a) and Q(a)*/
     
    599601  return n_Param(iParameter, C);
    600602//   const n_coeffType _filed_type = getCoeffType(C);
    601 // 
     603//
    602604//   if ( iParameter <= 0 || iParameter > rPar(r) )
    603605//     // Wrong parameter
    604606//     return NULL;
    605 // 
     607//
    606608//   if( _filed_type == n_algExt )
    607609//     return naParameter(iParameter, C);
    608 // 
     610//
    609611//   if( _filed_type == n_transExt )
    610612//     return ntParameter(iParameter, C);
    611 // 
     613//
    612614//   if (_filed_type == n_GF)// if (nCoeff_is_GF(C))
    613615//   {
     
    615617//     return nfPar(iParameter, C);
    616618//   }
    617 //   
     619//
    618620//   if (_filed_type == n_long_C) // if (nCoeff_is_long_C(C))
    619621//   {
    620 //     number   ngcPar(int i, const coeffs r);   
     622//     number   ngcPar(int i, const coeffs r);
    621623//     return ngcPar(iParameter, C);
    622624//   }
    623 // 
     625//
    624626//   return NULL;
    625627}
    626628
    627 /// if m == var(i)/1 => return i, 
     629/// if m == var(i)/1 => return i,
    628630int n_IsParam(number m, const ring r);
    629631
     
    637639}
    638640
    639    
     641
    640642/* R, Q, Fp: FALSE */
    641643static inline BOOLEAN rIsExtension(const ring r)
Note: See TracChangeset for help on using the changeset viewer.