Changeset f92fc2e in git

Timestamp:

Jun 16, 2010, 3:34:45 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

5dcc9a60fe5f6363361635bb231ee206f6a174b4

Parents:

fb104b7d78bc189a491c27b263c1337ce820192f

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2010-06-16 15:34:45+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 11:55:10+01:00

Message:

Further to inlines!

	../templates/out/

File:

• coeffs/inline_coeffs.h (modified) (5 diffs)

coeffs/inline_coeffs.h

@@ -118 +118 @@
    /// convertion, 0 if impossible
    int     (*cfInt)(number &n, const coeffs r);
+
 #ifdef HAVE_RINGS
    int     (*cfDivComp)(number a,number b,const coeffs r);
@@ -124 +125 @@
    number  (*cfExtGcd)(number a, number b, number *s, number *t,const coeffs r);
 #endif
+
    /// changes argument  inline: a:= -a
    number  (*cfNeg)(number a, const coeffs r);
@@ -145 +147 @@
            (*cfIsMOne)(number a, const coeffs r),
            (*cfGreaterZero)(number a, const coeffs r);
+   
    void    (*cfPower)(number a, int i, number * result, const coeffs r);
    number  (*cfGetDenom)(number &n, const coeffs r);
@@ -217 +220 @@
 
 // the access methods:
+
+/// return a copy of a
 static inline number n_Copy(number n,    const coeffs r){ return (r)->cfCopy(n, r); }
 static inline void   n_Delete(number* p, const coeffs r){ return (r)->cfDelete(p, r); }
+
+static inline BOOLEAN n_AreEqual(number a, number b, const coeffs r){ return (r)->cfEqual(a, b, r); }
 static inline BOOLEAN n_IsZero(number n, const coeffs r){ return (r)->cfIsZero(n,r); }
 static inline BOOLEAN n_IsOne(number n,  const coeffs r){ return (r)->cfIsOne(n,r); }
 static inline BOOLEAN n_IsMOne(number n, const coeffs r){ return (r)->cfIsMOne(n,r); }
 static inline BOOLEAN n_IsGreaterZero(number n, const coeffs r){ return (r)->cfGreaterZero(n,r); }
+// cfGreater?
+
+/// init with an integer
+static inline number n_Init(int i,       const coeffs r){ return (r)->cfInit(i,r); }
+
+/// changes argument  inline: a:= -a
 static inline number n_Neg(number n,     const coeffs r){ return (r)->cfNeg(n,r); }
-static inline number n_Init(int i,       const coeffs r){ return (r)->cfInit(i,r); }
+
+/// return 1/a
+static inline number n_Invers(number a,  const coeffs r){ return (r)->cfInvers(a,r); }
+
+/// how complicated, (0) => 0, otherwise positive
+static inline int    n_Size(number n,    const coeffs r){ return (r)->cfSize(n,r); }
+
+/// normalize the number. i.e. go to some canonnical representation (inplace)
+static inline void   n_Normalize(number& n, const coeffs r){ return (r)->cfNormalize(n,r); }
+
+/// Normalize and Write
 static inline void   n_Write(number& n,  const coeffs r){ return (r)->cfWrite(n,r); }
-static inline void   n_Normalize(number& n, const coeffs r){ return (r)->cfNormalize(n,r); }
-static inline number n_Invers(number a,  const coeffs r){ return (r)->cfInvers(a,r); }
-static inline int    n_Size(number n,    const coeffs r){ return (r)->cfSize(n,r); }
+
+/// Normalize and get denomerator
 static inline number n_GetDenom(number& n, const coeffs r){ return (r)->cfGetDenom(n, r); }
+
+/// Normalize and get numerator
 static inline number n_GetNumerator(number& n, const coeffs r){ return (r)->cfGetNumerator(n, r); }
 
 static inline void   n_Power(number a, int b, number *res, const coeffs r){ return (r)->cfPower(a,b,res,r); }
 
-static inline number n_Mult(number n1, number n2, const coeffs r){ return (r)->cfMult(n1, n2, r); }
-static inline number n_Add(number n1, number n2, const coeffs r){ return (r)->cfAdd(n1, n2, r); }
-static inline number n_Equal(number n1, number n2, const coeffs r){ return (r)->cfEqual(n1, n2, r); }
-static inline number n_Sub(number n1, number n2, const coeffs r){ return (r)->cfSub(n1, n2, r); }
+
+static inline number n_Mult(number a, number b, const coeffs r){ return (r)->cfMult(a, b, r); }
+/// Inplace multiplication: a := a * b
+static inline void n_InpMult(number &a, number b, const coeffs r){ return (r)->cfInpMult(a,b,r); }
+
+static inline number n_Sub(number a, number b, const coeffs r){ return (r)->cfSub(a, b, r); }
+static inline number n_Add(number a, number b, const coeffs r){ return (r)->cfAdd(a, b, r); }
+
+static inline number n_Div(number a, number b, const coeffs r){ return (r)->cfDiv(a,b,r); }
+static inline number n_IntDiv(number a, number b, const coeffs r){ return (r)->cfIntDiv(a,b,r); }
+static inline number n_ExactDiv(number a, number b, const coeffs r){ return (r)->cfExactDiv(a,b,r); }
+
 static inline number n_Gcd(number a, number b, const coeffs r){ return (r)->cfGcd(a,b,r); }
-static inline number n_IntDiv(number a, number b, const coeffs r){ return (r)->cfIntDiv(a,b,r); }
-static inline number n_Div(number a, number b, const coeffs r){ return (r)->cfDiv(a,b,r); }
-static inline number n_ExactDiv(number a, number b, const coeffs r){ return (r)->cfExactDiv(a,b,r); }
-static inline number n_InpMult(number a, number b, const coeffs r){ return (r)->cfInpMult(a,b,r); }
-
-
-static inline BOOLEAN n_DBTest(number a, const char *filename, const int linenumber, const coeffs r)
+
+/// Tests whether n is a correct number.
+static inline BOOLEAN n_DBTest(number n, const char *filename, const int linenumber, const coeffs r)
 {
 #ifdef LDEBUG
-  return (r)->cfDBTest(a, filename, linenumber, r);
+  return (r)->cfDBTest(n, filename, linenumber, r);
 #else
   return TRUE;
@@ -256 +284 @@
 #define n_Test(a,r)  n_DBTest(a, __FILE__, __LINE__, r)
 
+// Missing wrappers for:
+// cfIntMod, cfPar, cfParDeg, cfInt, cfRePart, cfImPart, cfRead, cfLcm, cfSetMap, cfName, cfInit_bigint
+// HAVE_RINGS: cfDivComp, cfIsUnit, cfGetUnit, cfExtGcd... cfDivBy
+
+
 // Deprecated:
 static inline BOOLEAN n_GreaterZero(number n, const coeffs r){ return n_IsGreaterZero(n,r); }
+static inline BOOLEAN n_Equal(number a, number b, const coeffs r){ return n_AreEqual(a, b, r); }
 
 // Deprecated: