Changeset b807aa0 in git

Timestamp:

Jul 16, 2012, 8:43:30 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

644f813f8a73f38c6448af263a3ee11e37731a67

Parents:

cc7180ed9409923477370909b14bca995904b313

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-07-16 20:43:30+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-07-17 21:33:54+02:00

Message:

minor improvements at coeffs

add: doxygen
chg: avoid access to internals AFAP + more assumes
chg: eliminate compiler warning about an unused function argument

Location:

libpolys/coeffs

Files:

• coeffs.h (modified) (7 diffs)
• numbers.cc (modified) (1 diff)

libpolys/coeffs/coeffs.h

@@ -21 +21 @@
 {
   n_unknown=0,
-  n_Zp,
-  n_Q,
-  n_R,
-  n_GF,
-  n_long_R,
+  n_Zp, /**< \F{p < ?} */
+  n_Q,  /**< rational (GMP) numbers */
+  n_R,  /**< single prescision (6,6) real numbers */
+  n_GF, /**< \GF{p^n < 32001?} */
+  n_long_R, /**< real (GMP) numbers */
   n_algExt,  /**< used for all algebraic extensions, i.e.,
                 the top-most extension in an extension tower
@@ -32 +32 @@
                   the top-most extension in an extension tower
                   is transcendental */
-  n_long_C,
-  // only used if HAVE_RINGS is defined:
-  n_Z,
-  n_Zn,
-  n_Zpn, // does no longer exist?
-  n_Z2m,
-  n_CF
+  n_long_C, /**< complex (GMP) numbers */
+  n_Z, /**< only used if HAVE_RINGS is defined: ? */
+  n_Zn, /**< only used if HAVE_RINGS is defined: ? */
+  n_Zpn, /**< only used if HAVE_RINGS is defined: does no longer exist? */
+  n_Z2m, /**< only used if HAVE_RINGS is defined: ? */
+  n_CF /**< ? */
 };
 
@@ -335 +334 @@
 
 
+/// Return the characteristic of the coeff. domain.
+static inline int n_GetChar(const coeffs r)
+{
+  assume(r != NULL);
+  return r->ch;
+}
+
+
 // the access methods (part 2):
 
@@ -723 +730 @@
 {
   assume(r != NULL);
-  return ((r->ringtype == 0) && (r->ch != 0) && nCoeff_is_Extension(r));
+  return ((!nCoeff_is_Ring(r)) && (n_GetChar(r) != 0) && nCoeff_is_Extension(r));
 }
 
@@ -736 +743 @@
 {
   assume(r != NULL);
-  return ((r->ringtype == 0) && (r->ch == p) && nCoeff_is_Extension(r));
+  assume(p != 0);
+  return ((!nCoeff_is_Ring(r)) && (n_GetChar(r) == p) && nCoeff_is_Extension(r));
 }
 
@@ -748 +756 @@
 {
   assume(r != NULL);
-  return ((r->ringtype == 0) && (r->ch == 0) && nCoeff_is_Extension(r));
+  return ((!nCoeff_is_Ring(r)) && (n_GetChar(r) == 0) && nCoeff_is_Extension(r));
 }
 
@@ -784 +792 @@
 // HAVE_RINGS: cfDivComp, cfExtGcd... 
 
-/// Return the characteristic of the coeff. domain.
-static inline int n_GetChar(const coeffs r)
-{
-  assume(r != NULL);
-  return r->ch;
-}
-
-#endif
-
+
+#endif
+

libpolys/coeffs/numbers.cc

@@ -88 +88 @@
 }
 
-static number ndParameter(const int i, const coeffs r)
+static number ndParameter(const int, const coeffs r)
 {
   Werror("ndParameter: n_Parameter is not implemented/relevant for (coeff_type = %d)",getCoeffType(r));