Ignore:
Timestamp:
Aug 16, 2016, 10:47:22 AM (8 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38dfc5131670d387a89455159ed1e071997eec94')
Children:
f8735a6f0fe51d2c1c11121c35982563485c2b25
Parents:
3238c13e1d0da1d4c477894d1b70583f86f828f9
Message:
Singular_4_1: new names; Ring. Matrix, Number, construction cf[x], ....
File:
1 edited

Legend:

Unmodified
Added
Removed

  • libpolys/polys/monomials/ring.h

    r3238c1 re54c6ee  
    7272ro_typ;
    7373
     74/// order stuff
     75typedef enum rRingOrder_t
     76{
     77  ringorder_no = 0,
     78  ringorder_a,
     79  ringorder_a64, ///< for int64 weights
     80  ringorder_c,
     81  ringorder_C,
     82  ringorder_M,
     83  ringorder_S, ///< S?
     84  ringorder_s, ///< s?
     85  ringorder_lp,
     86  ringorder_dp,
     87  ringorder_rp,
     88  ringorder_Dp,
     89  ringorder_wp,
     90  ringorder_Wp,
     91  ringorder_ls,
     92  ringorder_ds,
     93  ringorder_Ds,
     94  ringorder_ws,
     95  ringorder_Ws,
     96  ringorder_am,
     97  ringorder_L,
     98  // the following are only used internally
     99  ringorder_aa, ///< for idElimination, like a, except pFDeg, pWeigths ignore it
     100  ringorder_rs, ///< opposite of ls
     101  ringorder_IS, ///< Induced (Schreyer) ordering
     102  ringorder_unspec
     103} rRingOrder_t;
     104
     105typedef enum rOrderType_t
     106{
     107  rOrderType_General = 0, ///< non-simple ordering as specified by currRing
     108  rOrderType_CompExp,     ///< simple ordering, component has priority
     109  rOrderType_ExpComp,     ///< simple ordering, exponent vector has priority
     110                          ///< component not compatible with exp-vector order
     111  rOrderType_Exp,         ///< simple ordering, exponent vector has priority
     112                          ///< component is compatible with exp-vector order
     113  rOrderType_Syz,         ///< syzygy ordering
     114  rOrderType_Schreyer,    ///< Schreyer ordering
     115  rOrderType_Syz2dpc,     ///< syzcomp2dpc
     116  rOrderType_ExpNoComp    ///< simple ordering, differences in component are
     117                          ///< not considered
     118} rOrderType_t;
     119
    74120// ordering is a degree ordering
    75121struct sro_dp
    … …  
    341387
    342388ring   rDefault(int ch, int N, char **n);
    343 ring   rDefault(const coeffs cf, int N, char **n);
     389ring   rDefault(const coeffs cf, int N, char **n, const rRingOrder_t o=ringorder_lp);
    344390ring   rDefault(int ch, int N, char **n,int ord_size, int *ord, int *block0, int *block1, int **wvhdl=NULL);
    345391ring   rDefault(const coeffs cf, int N, char **n,int ord_size, int *ord, int *block0, int *block1, int **wvhdl=NULL);
    … …  
    660706
    661707
    662 /// order stuff
    663 typedef enum rRingOrder_t
    664 {
    665   ringorder_no = 0,
    666   ringorder_a,
    667   ringorder_a64, ///< for int64 weights
    668   ringorder_c,
    669   ringorder_C,
    670   ringorder_M,
    671   ringorder_S, ///< S?
    672   ringorder_s, ///< s?
    673   ringorder_lp,
    674   ringorder_dp,
    675   ringorder_rp,
    676   ringorder_Dp,
    677   ringorder_wp,
    678   ringorder_Wp,
    679   ringorder_ls,
    680   ringorder_ds,
    681   ringorder_Ds,
    682   ringorder_ws,
    683   ringorder_Ws,
    684   ringorder_am,
    685   ringorder_L,
    686   // the following are only used internally
    687   ringorder_aa, ///< for idElimination, like a, except pFDeg, pWeigths ignore it
    688   ringorder_rs, ///< opposite of ls
    689   ringorder_IS, ///< Induced (Schreyer) ordering
    690   ringorder_unspec
    691 } rRingOrder_t;
    692 
    693 typedef enum rOrderType_t
    694 {
    695   rOrderType_General = 0, ///< non-simple ordering as specified by currRing
    696   rOrderType_CompExp,     ///< simple ordering, component has priority
    697   rOrderType_ExpComp,     ///< simple ordering, exponent vector has priority
    698                           ///< component not compatible with exp-vector order
    699   rOrderType_Exp,         ///< simple ordering, exponent vector has priority
    700                           ///< component is compatible with exp-vector order
    701   rOrderType_Syz,         ///< syzygy ordering
    702   rOrderType_Schreyer,    ///< Schreyer ordering
    703   rOrderType_Syz2dpc,     ///< syzcomp2dpc
    704   rOrderType_ExpNoComp    ///< simple ordering, differences in component are
    705                           ///< not considered
    706 } rOrderType_t;
    707 
    708708static inline BOOLEAN rIsSyzIndexRing(const ring r)
    709709{ assume(r != NULL); assume(r->cf != NULL); return r->order[0] == ringorder_s;}
Note: See TracChangeset for help on using the changeset viewer.