Changeset 9f1a52 in git

Timestamp:

May 18, 2011, 12:45:15 AM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

99ae0c026dcf2240aeab92b95e166bfc5ed46566

Parents:

2c41bc0e28c6628127866480994b3041a3c1f0af

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-05-18 00:45:15+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 12:36:08+01:00

Message:

FIX: fixed the inplace addition in n_Q (longrat)

Location:

libpolys

Files:

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

libpolys/coeffs/longrat.cc

@@ -2173 +2173 @@
 number nlShort3_noinline(number x);
 
-LINLINE number nlInpAdd (number a, number b, const coeffs r)
+LINLINE number nlInpAdd_(number a, number b, const coeffs r)
 {
   if (SR_HDL(a) & SR_HDL(b) & SR_INT)
@@ -2323 +2323 @@
   }
 }
+
+LINLINE void nlInpAdd(number &a, number b, const coeffs r)
+{
+  a = nlInpAdd_(a, b, r);
+}
+
 
 LINLINE number nlMult (number a, number b, const coeffs R)

libpolys/coeffs/longrat.h

@@ -106 +106 @@
 void nlInpGcd(number &a, number b, const coeffs r);
 void nlInpIntDiv(number &a, number b, const coeffs r);
-LINLINE number nlInpAdd(number la, number li, const coeffs r);
+
+LINLINE number nlInpAdd_(number a, number b, const coeffs r);
+LINLINE void nlInpAdd(number &a, number b, const coeffs r);
 LINLINE void nlInpMult(number &a, number b, const coeffs r);
 

libpolys/polys/templates/p_Numbers.h

@@ -57 +57 @@
 //#define n_InpMult_RingGeneral(n1, n2, r)   r->cf->nInpMult(n1, n2, r->cf)
 #define n_InpMult_RingGeneral(n1, n2, r)   ndInpMult(n1, n2, r->cf)
-#define n_InpAdd_RingGeneral(n1, n2, r)    ndInpAdd(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); }
 #endif
 
@@ -72 +73 @@
 
 static inline void n_InpAdd_FieldZp(number &n1, number n2, const ring r)
-{ n1=npAddM(n1, n2, r->cf); }
+{ assume(rField_is_Zp(r)); n1=npAddM(n1, n2, r->cf); }
 
 #define DO_LINLINE
-#include "coeffs/longrat.cc"
+#include <coeffs/longrat.cc>
 #define n_Copy_FieldQ(n, r)        nlCopy(n, r->cf)
 #define n_Delete_FieldQ(n, r)      nlDelete(n,r->cf)
@@ -85 +86 @@
 #define n_Sub_FieldQ(n1, n2, r)    nlSub(n1, n2, r->cf)
 #define n_InpMult_FieldQ(n1, n2, r) nlInpMult(n1, n2, r->cf)
-#define n_InpAdd_FieldQ(n1, n2, r)  nlInpAdd(n1, n2, r->cf)
+
+static inline void n_InpAdd_FieldQ(number &n1, number n2, const ring r)
+{ assume(rField_is_Q(r)); nlInpAdd(n1, n2, r->cf); }
 #endif