Changeset 9f1a52 in git
 Timestamp:
 May 18, 2011, 12:45:15 AM (12 years ago)
 Branches:
 (u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')
 Children:
 99ae0c026dcf2240aeab92b95e166bfc5ed46566
 Parents:
 2c41bc0e28c6628127866480994b3041a3c1f0af
 gitauthor:
 Oleksandr Motsak <motsak@mathematik.unikl.de>20110518 00:45:15+02:00
 gitcommitter:
 Mohamed Barakat <mohamed.barakat@rwthaachen.de>20111109 12:36:08+01:00
 Location:
 libpolys
 Files:

 3 edited
Legend:
 Unmodified
 Added
 Removed

libpolys/coeffs/longrat.cc
r2c41bc r9f1a52 2173 2173 number nlShort3_noinline(number x); 2174 2174 2175 LINLINE number nlInpAdd 2175 LINLINE number nlInpAdd_(number a, number b, const coeffs r) 2176 2176 { 2177 2177 if (SR_HDL(a) & SR_HDL(b) & SR_INT) … … 2323 2323 } 2324 2324 } 2325 2326 LINLINE void nlInpAdd(number &a, number b, const coeffs r) 2327 { 2328 a = nlInpAdd_(a, b, r); 2329 } 2330 2325 2331 2326 2332 LINLINE number nlMult (number a, number b, const coeffs R) 
libpolys/coeffs/longrat.h
r2c41bc r9f1a52 106 106 void nlInpGcd(number &a, number b, const coeffs r); 107 107 void nlInpIntDiv(number &a, number b, const coeffs r); 108 LINLINE number nlInpAdd(number la, number li, const coeffs r); 108 109 LINLINE number nlInpAdd_(number a, number b, const coeffs r); 110 LINLINE void nlInpAdd(number &a, number b, const coeffs r); 109 111 LINLINE void nlInpMult(number &a, number b, const coeffs r); 110 112 
libpolys/polys/templates/p_Numbers.h
r2c41bc r9f1a52 57 57 //#define n_InpMult_RingGeneral(n1, n2, r) r>cf>nInpMult(n1, n2, r>cf) 58 58 #define n_InpMult_RingGeneral(n1, n2, r) ndInpMult(n1, n2, r>cf) 59 #define n_InpAdd_RingGeneral(n1, n2, r) ndInpAdd(n1, n2, r>cf) 59 static inline void n_InpAdd_RingGeneral(number &n1, number n2, const ring r) 60 { assume(rField_is_Ring(r)); ndInpAdd(n1, n2, r>cf); } 60 61 #endif 61 62 … … 72 73 73 74 static inline void n_InpAdd_FieldZp(number &n1, number n2, const ring r) 74 { n1=npAddM(n1, n2, r>cf); }75 { assume(rField_is_Zp(r)); n1=npAddM(n1, n2, r>cf); } 75 76 76 77 #define DO_LINLINE 77 #include "coeffs/longrat.cc"78 #include <coeffs/longrat.cc> 78 79 #define n_Copy_FieldQ(n, r) nlCopy(n, r>cf) 79 80 #define n_Delete_FieldQ(n, r) nlDelete(n,r>cf) … … 85 86 #define n_Sub_FieldQ(n1, n2, r) nlSub(n1, n2, r>cf) 86 87 #define n_InpMult_FieldQ(n1, n2, r) nlInpMult(n1, n2, r>cf) 87 #define n_InpAdd_FieldQ(n1, n2, r) nlInpAdd(n1, n2, r>cf) 88 89 static inline void n_InpAdd_FieldQ(number &n1, number n2, const ring r) 90 { assume(rField_is_Q(r)); nlInpAdd(n1, n2, r>cf); } 88 91 #endif
Note: See TracChangeset
for help on using the changeset viewer.