Changeset 240295 in git for libpolys

Timestamp:

Apr 26, 2013, 1:24:59 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

3c2c9540b63c2f11ed9fe4817807c8b3e50343186b7484b5930065ac134d995e76335de4928d4e8e

Parents:

a44bcfd7437f94c20602b09730efd48bf03c03ba

Message:

add: n_InpAdd

from master

Location:

libpolys

Files:

• coeffs/coeffs.h (modified) (2 diffs)
• coeffs/longrat.cc (modified) (1 diff)
• coeffs/numbers.cc (modified) (1 diff)
• polys/templates/p_Numbers.h (modified) (2 diffs)

libpolys/coeffs/coeffs.h

@@ -190 +190 @@
    /// Inplace: a *= b
    void    (*cfInpMult)(number &a, number b, const coeffs r);
+
+   /// Inplace: a += b
+   void    (*cfInpAdd)(number &a, number b, const coeffs r);
 
    /// maps the bigint i (from dummy == coeffs_BIGINT!!!) into the
@@ -532 +535 @@
 { assume(r != NULL); assume(r->cfInpMult!=NULL); r->cfInpMult(a,b,r); }
 
+/// addition of 'a' and 'b';
+/// replacement of 'a' by the sum a+b
+static inline void n_InpAdd(number &a, number b, const coeffs r)
+{ assume(r != NULL); assume(r->cfInpAdd!=NULL); r->cfInpAdd(a,b,r); }
+
 /// return the difference of 'a' and 'b', i.e., a-b
 static inline number n_Sub(number a, number b, const coeffs r)

libpolys/coeffs/longrat.cc

@@ -2888 +2888 @@
   //r->cfName = ndName;
   r->cfInpMult=nlInpMult;
+  r->cfInpAdd=nlInpAdd;
   r->cfInit_bigint=nlCopyMap;
   r->cfCoeffWrite=nlCoeffWrite;

libpolys/coeffs/numbers.cc

@@ -327 +327 @@
     n->cfDelete= ndDelete;
     n->cfInpMult=ndInpMult;
+    n->cfInpAdd=ndInpAdd;
     n->cfCopy = ndCopy;
     n->cfIntMod=ndIntMod; /* dummy !! */

libpolys/polys/templates/p_Numbers.h

@@ -43 +43 @@
 
 static inline void n_InpAdd_FieldGeneral(number &n1, number n2, const ring r)
-{ ndInpAdd(n1, n2, r->cf); }
+{ n_InpAdd(n1, n2, r->cf); }
 
 #ifdef HAVE_RINGS
@@ -57 +57 @@
 #define n_InpMult_RingGeneral(n1, n2, r)   ndInpMult(n1, n2, r->cf)
 static inline void n_InpAdd_RingGeneral(number &n1, number n2, const ring r)
-{ assume(rField_is_Ring(r)); ndInpAdd(n1, n2, r->cf); }
+{ assume(rField_is_Ring(r)); n_InpAdd(n1, n2, r->cf); }
 #endif