Changeset 24d28c in git

Timestamp:

Jul 19, 2013, 2:59:19 PM (11 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

5b6807c5be64d7eb424e7d933a00f8cbb137d50c

Parents:

2b2e08e9ac466fdf41a00e09569fbe1ea27db681

Message:

chg: comments for ro_* enum

File:

• libpolys/polys/monomials/ring.h (modified) (9 diffs)

libpolys/polys/monomials/ring.h

@@ -51 +51 @@
 /// returns a poly from dest_r which is a ShallowCopy of s_p from source_r
 /// assumes that source_r->N == dest_r->N and that orderings are the same
-typedef poly (*pShallowCopyDeleteProc)(poly s_p, ring source_r, ring dest_r, 
+typedef poly (*pShallowCopyDeleteProc)(poly s_p, ring source_r, ring dest_r,
                                        omBin dest_bin);
 
-
+// ro_typ describes what to store at the corresping "data" place in p->exp
+// none of the directly corresponds to a ring ordering (ringorder_*)
+// as each ringorder_* blocks corrsponds to 0..2 sro-blocks
 typedef enum
 {
-  ro_dp, // ordering is a degree ordering
-  ro_wp, // ordering is a weighted degree ordering
-  ro_am, // ordering is am: weights for vars + weights for gen
-  ro_wp64, // ordering is a weighted64 degree ordering
-  ro_wp_neg, // ordering is a weighted degree ordering
-             // with possibly negative weights
-  ro_cp,    // ordering duplicates variables
-  ro_syzcomp, // ordering indicates "subset" of component number (ringorder_S)
-  ro_syz, // ordering  with component number >syzcomp is lower (ringorder_s)
-  ro_isTemp, ro_is, // Induced Syzygy (Schreyer) ordering (and prefix data placeholder dummy) (ringorder_IS)
+  ro_dp, // total degree with weights 1
+  ro_wp, // total weighted degree with weights>0 in wvhdl
+  ro_am, // weights for vars + weights for gen
+  ro_wp64, // weighted64 degree weights in wvhdl
+  ro_wp_neg, // total weighted degree with weights in Z in wvhdl
+             // (with possibly negative weights)
+  ro_cp,    // ??ordering duplicates variables
+  ro_syzcomp, // ??ordering indicates "subset" of component number (ringorder_S)
+  ro_syz, // component number if <=syzcomp else 0 (ringorder_s)
+  ro_isTemp, ro_is, // ??Induced Syzygy (Schreyer) ordering (and prefix data placeholder dummy) (ringorder_IS)
   ro_none
 }
@@ -101 +103 @@
   int *weights_m; // pointers into wvhdl field of length len_gen + 1
                 // len_gen, mod_w_1, .. mod_w_len, 0
-  
+
 };
 typedef struct sro_am sro_am;
@@ -250 +252 @@
 //   int_number    cf->modNumber;
 // #endif
-  
+
   unsigned long options; /* ring dependent options */
 
@@ -354 +356 @@
 static inline bool rIsPluralRing(const ring r)
 {
-  assume(r != NULL); assume(r->cf != NULL);   
+  assume(r != NULL); assume(r->cf != NULL);
 #ifdef HAVE_PLURAL
   nc_struct *n;
@@ -478 +480 @@
 static inline BOOLEAN rField_is_Q_a(const ring r)
 { assume(r != NULL); assume(r->cf != NULL); return nCoeff_is_Q_a(r->cf); }
-   
+
 static inline BOOLEAN rField_is_long_R(const ring r)
 { assume(r != NULL); assume(r->cf != NULL); return nCoeff_is_long_R(r->cf); }
@@ -492 +494 @@
 { assume(r != NULL); assume(r->cf != NULL); return nCoeff_has_simple_Alloc(r->cf); }
 
-/// Alg. or trans. ext. 
+/// Alg. or trans. ext.
 static inline BOOLEAN rField_is_Extension(const ring r)
 { assume(r != NULL); assume(r->cf != NULL); return nCoeff_is_Extension(r->cf); } /* Z/p(a) and Q(a)*/
@@ -599 +601 @@
   return n_Param(iParameter, C);
 //   const n_coeffType _filed_type = getCoeffType(C);
-// 
+//
 //   if ( iParameter <= 0 || iParameter > rPar(r) )
 //     // Wrong parameter
 //     return NULL;
-// 
+//
 //   if( _filed_type == n_algExt )
 //     return naParameter(iParameter, C);
-// 
+//
 //   if( _filed_type == n_transExt )
 //     return ntParameter(iParameter, C);
-// 
+//
 //   if (_filed_type == n_GF)// if (nCoeff_is_GF(C))
 //   {
@@ -615 +617 @@
 //     return nfPar(iParameter, C);
 //   }
-//   
+//
 //   if (_filed_type == n_long_C) // if (nCoeff_is_long_C(C))
 //   {
-//     number   ngcPar(int i, const coeffs r);    
+//     number   ngcPar(int i, const coeffs r);
 //     return ngcPar(iParameter, C);
 //   }
-// 
+//
 //   return NULL;
 }
 
-/// if m == var(i)/1 => return i, 
+/// if m == var(i)/1 => return i,
 int n_IsParam(number m, const ring r);
 
@@ -637 +639 @@
 }
 
-   
+
 /* R, Q, Fp: FALSE */
 static inline BOOLEAN rIsExtension(const ring r)