Changeset 8cb8e1 in git

Timestamp:

Apr 28, 2010, 2:53:08 PM (13 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

db3180ca57d54e8d3b4f38b7dc0c1af1a3bdba44

Parents:

77e585d91301adb39a7f4d69c34f795b82ace33a

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2010-04-28 14:53:08+02:00

git-committer:

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

Message:

Fixed gnumpc.*

Location:

coeffs

Files:

• gnumpc.cc (modified) (20 diffs)
• gnumpc.h (modified) (2 diffs)
• numbers.h (modified) (3 diffs)

coeffs/gnumpc.cc

@@ -16 +16 @@
 #include "gnumpfl.h"
 #include "mpr_complex.h"
+#include "output.h"
+#include "omalloc.h"
 
 extern size_t gmp_output_digits;
 
 
-number ngcMapQ(number from)
+number ngcMapQ(number from, const coeffs)
 {
   if ( from != NULL )
@@ -39 +41 @@
   number N() const {return _n;}
 };
-static number ngcMapLongR(number from)
+static number ngcMapLongR(number from, const coeffs)
 {
   if ( from != NULL )
@@ -49 +51 @@
     return NULL;
 }
-static number ngcMapR(number from)
+static number ngcMapR(number from, const coeffs)
 {
   if ( from != NULL )
@@ -60 +62 @@
 }
 extern ring ngfMapRing;
-static number ngcMapP(number from)
+static number ngcMapP(number from, const coeffs)
 {
   if ( from != NULL)
@@ -145 +147 @@
 
 /*2
-* copy a to b
-*/
-number ngcCopy(number a)
+ * copy a to b
+*/
+number ngcCopy(number a, const coeffs)
 {
   gmp_complex* b= new gmp_complex( *(gmp_complex*)a );
@@ -163 +165 @@
 gmp_complex ngc_m1(-1);
 
-number ngcNeg (number a)
+number ngcNeg (number a, const coeffs)
 {
   gmp_complex* r=(gmp_complex*)a;
@@ -173 +175 @@
 * 1/a
 */
-number ngcInvers(number a)
+number ngcInvers(number a, const coeffs)
 {
   gmp_complex* r = NULL;
@@ -190 +192 @@
 * u:= a + b
 */
-number ngcAdd (number a, number b)
+number ngcAdd (number a, number b, const coeffs)
 {
   gmp_complex* r= new gmp_complex( (*(gmp_complex*)a) + (*(gmp_complex*)b) );
@@ -199 +201 @@
 * u:= a - b
 */
-number ngcSub (number a, number b)
+number ngcSub (number a, number b, const coeffs R)
 {
   gmp_complex* r= new gmp_complex( (*(gmp_complex*)a) - (*(gmp_complex*)b) );
@@ -217 +219 @@
 * u := a / b
 */
-number ngcDiv (number a, number b)
+number ngcDiv (number a, number b, const coeffs)
 {
   if (((gmp_complex*)b)->isZero())
@@ -232 +234 @@
 * u:= x ^ exp
 */
-void ngcPower ( number x, int exp, number * u )
+void ngcPower ( number x, int exp, number * u, const coeffs R)
 {
   if ( exp == 0 )
@@ -259 +261 @@
   if (exp&1==1)
   {
-    ngcPower(x,exp-1,u);
+    ngcPower(x,exp-1,u, R);
     gmp_complex *n=new gmp_complex();
     *n=*(gmp_complex*)x;
@@ -269 +271 @@
     number w;
     nNew(&w);
-    ngcPower(x,exp/2,&w);
-    ngcPower(w,2,u);
+    ngcPower(x,exp/2,&w, R);
+    ngcPower(w,2,u, R);
     nDelete(&w);
   }
 }
 
-BOOLEAN ngcIsZero (number a)
+BOOLEAN ngcIsZero (number a, const coeffs)
 {
   return ( ((gmp_complex*)a)->real().isZero() && ((gmp_complex*)a)->imag().isZero());
 }
 
-number ngcRePart(number a)
+number ngcRePart(number a, const coeffs)
 {
   gmp_complex* n = new gmp_complex(((gmp_complex*)a)->real());
@@ -286 +288 @@
 }
 
-number ngcImPart(number a)
+number ngcImPart(number a, const coeffs)
 {
   gmp_complex* n = new gmp_complex(((gmp_complex*)a)->imag());
@@ -295 +297 @@
 * za >= 0 ?
 */
-BOOLEAN ngcGreaterZero (number a)
+BOOLEAN ngcGreaterZero (number a, const coeffs)
 {
   if ( ! ((gmp_complex*)a)->imag().isZero() )
@@ -306 +308 @@
 * a > b ?
 */
-BOOLEAN ngcGreater (number a, number b)
+BOOLEAN ngcGreater (number a, number b, const coeffs)
 {
   gmp_complex *aa=(gmp_complex*)a;
@@ -316 +318 @@
 * a = b ?
 */
-BOOLEAN ngcEqual (number a, number b)
+BOOLEAN ngcEqual (number a, number b, const coeffs)
 {
   gmp_complex *aa=(gmp_complex*)a;
@@ -326 +328 @@
 * a == 1 ?
 */
-BOOLEAN ngcIsOne (number a)
+BOOLEAN ngcIsOne (number a, const coeffs)
 {
   return (((gmp_complex*)a)->real().isOne() && ((gmp_complex*)a)->imag().isZero());
@@ -335 +337 @@
 * a == -1 ?
 */
-BOOLEAN ngcIsMOne (number a)
+BOOLEAN ngcIsMOne (number a, const coeffs)
 {
   return (((gmp_complex*)a)->real().isMOne() && ((gmp_complex*)a)->imag().isZero());
@@ -344 +346 @@
 * extracts the number a from s, returns the rest
 */
-const char * ngcRead (const char * s, number * a)
+const char * ngcRead (const char * s, number * a, const coeffs R)
 {
   if ((*s >= '0') && (*s <= '9'))
   {
     gmp_float *re=NULL;
-    s=ngfRead(s,(number *)&re);
+    s=ngfRead(s,(number *)&re, R);
     gmp_complex *aa=new gmp_complex(*re);
     *a=(number)aa;

coeffs/gnumpc.h

@@ -26 +26 @@
 number   ngcDiv(number a, number b, const coeffs r);
 void     ngcPower(number x, int exp, number *lu, const coeffs r);
-number   ngcCopy(number a);
+number   ngcCopy(number a, const coeffs);
 number   ngc_Copy(number a, coeffs r);
 const char * ngcRead (const char *s, number *a, const coeffs r);
@@ -35 +35 @@
 
 #ifdef LDEBUG
-BOOLEAN  ngcDBTest(number a, const char *f, const int l);
+BOOLEAN  ngcDBTest(number a, const char *f, const int l, const coeffs);
 #endif
 void     ngcDelete(number *a, const coeffs r);

coeffs/numbers.h

@@ -114 +114 @@
 
 
+#ifdef _TRY
+#define rField_is_Q(r) nField_is_Q(r)
+#define rField_is_long_R(r) nField_is_long_R(r) 
+#define rField_is_long_C(r) nField_is_long_C(r)
+#define rField_is_R(r) nField_is_R(r)
+#define rField_is_Zp(r) nField_is_Zp(r)
+#endif
+
+
 #ifdef HAVE_RINGS
 static inline BOOLEAN nField_is_Zp(const coeffs r)
@@ -124 +133 @@
 { return (r->ringtype == 0) && (r->ch == 0) && (r->parameter==NULL); }
 
+
 static inline BOOLEAN nField_is_numeric(const coeffs r) /* R, long R, long C */
 { return (r->ringtype == 0) && (r->ch ==  -1); }
@@ -162 +172 @@
   return FALSE;
 }
+
 #else
+
+
 static inline BOOLEAN nField_is_Zp(const coeffs r)
 { return (r->ch > 1) && (r->parameter==NULL); }