Changeset d663f2 in git

Timestamp:

Aug 25, 2011, 6:52:34 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

50b874afcba55b265e25d44bbebf37f1a74402a6

Parents:

ef6f951a70b932a931c74771bcc97ed20e73dad7

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-25 18:52:34+02:00

git-committer:

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

Message:

FIX: fixing longrat-related bugs (due to the Uglyness in p_Numbers.h!)

Location:

libpolys

Files:

• coeffs/longrat.cc (modified) (15 diffs)
• coeffs/longrat.h (modified) (2 diffs)
• coeffs/longrat0.cc (modified) (2 diffs)
• coeffs/modulop.cc (modified) (1 diff)
• polys/clapconv.cc (modified) (1 diff)
• polys/templates/p_Numbers.h (modified) (1 diff)

libpolys/coeffs/longrat.cc

@@ -6 +6 @@
 * ABSTRACT: computation with long rational numbers (Hubert Grassmann)
 */
+
 #include "config.h"
 #include <misc/auxiliary.h>
@@ -129 +130 @@
 }
 
-//#ifndef SI_THREADS
-omBin rnumber_bin = omGetSpecBin(sizeof(snumber));
-//#endif
 
 number nlOne=INT_TO_SR(1);
@@ -160 +158 @@
 static number nlMapLongR(number from, const coeffs src, const coeffs dst);
 static number nlMapR(number from, const coeffs src, const coeffs dst);
+
 
 #ifdef HAVE_RINGS
@@ -323 +322 @@
   else
   {
-    number z=(number)omAllocBin(rnumber_bin);
+    number z = ALLOC_RNUMBER(); //Q!? // (number)omAllocBin(rnumber_bin);
 #if defined(LDEBUG)
     z->debug=123456;
@@ -542 +541 @@
 }
 
-void nlMPZ(mpz_t m, number &n, const coeffs r)
-{
-  assume( getCoeffType(r) == ID );
-   
-  nlTest(n, r);
-  nlNormalize(n, r);
-  if (SR_HDL(n) & SR_INT) mpz_init_set_si(m, SR_TO_INT(n));     /* n fits in an int */
-  else             mpz_init_set(m, (mpz_ptr)n->z);
-}
-
-
 /*2
 * convert number to int
@@ -723 +711 @@
     bb->debug=654324;
 #endif
-    omFreeBin((void *)bb, rnumber_bin);
+    FREE_RNUMBER(bb); // omFreeBin((void *)bb, rnumber_bin);
   }
   u=nlShort3(u);
@@ -789 +777 @@
     bb->debug=654324;
 #endif
-    omFreeBin((void *)bb, rnumber_bin);
+    FREE_RNUMBER(bb); // omFreeBin((void *)bb, rnumber_bin);
   }
   u=nlShort3(u);
@@ -866 +854 @@
     bb->debug=654324;
 #endif
-    omFreeBin((void *)bb, rnumber_bin);
+    FREE_RNUMBER(bb); // omFreeBin((void *)bb, rnumber_bin);
   }
   if (mpz_isNeg(u->z))
@@ -909 +897 @@
     if (r==0)
     {
-      omFreeBin((void *)u, rnumber_bin);
+      FREE_RNUMBER(u); // omFreeBin((void *)u, rnumber_bin);
       return INT_TO_SR(i/j);
     }
@@ -1456 +1444 @@
 #endif
     }
-    omFreeBin((void *) *a, rnumber_bin);
+    FREE_RNUMBER(*a); // omFreeBin((void *) *a, rnumber_bin);
   }
 }
@@ -2112 +2100 @@
 }
 
-
-number nlInitMPZ(mpz_t m, const coeffs r)
-{
-  number z = ALLOC_RNUMBER();
-  mpz_init_set(z->z, m);
-  mpz_init_set_ui(z->n, 1);
-  z->s = 3;
-  return z;   
-}
-
 /*2
 * a == 1 ?
@@ -2448 +2426 @@
 #ifndef P_NUMBERS_H
 
+static void nlMPZ(mpz_t m, number &n, const coeffs r)
+{
+  assume( getCoeffType(r) == ID );
+   
+  nlTest(n, r);
+  nlNormalize(n, r);
+  if (SR_HDL(n) & SR_INT) mpz_init_set_si(m, SR_TO_INT(n));     /* n fits in an int */
+  else             mpz_init_set(m, (mpz_ptr)n->z);
+}
+
+
+static number nlInitMPZ(mpz_t m, const coeffs r)
+{
+  number z = ALLOC_RNUMBER();
+  mpz_init_set(z->z, m);
+  mpz_init_set_ui(z->n, 1);
+  z->s = 3;
+  return z;   
+}
+
+
 void nlInpGcd(number &a, number b, const coeffs r)
 {
@@ -2607 +2606 @@
   r->cfKillChar = ndKillChar; /* dummy */
 
+  r->cfInitMPZ = nlInitMPZ;
+  r->cfMPZ  = nlMPZ;
+   
   r->cfMult  = nlMult;
   r->cfSub   = nlSub;
@@ -2615 +2617 @@
   r->cfExactDiv= nlExactDiv;
   r->cfInit = nlInit;
-  r->cfInitMPZ = nlInitMPZ;
   r->cfSize  = nlSize;
   r->cfInt  = nlInt;
-  r->cfMPZ = nlMPZ;
-  
+   
   r->cfChineseRemainder=nlChineseRemainder;
   r->cfFarey=nlFarey;
@@ -2707 +2707 @@
     {
       mpz_clear(&r->z);
-      omFreeBin((void *)r, rnumber_bin);
+      FREE_RNUMBER(r); //  omFreeBin((void *)r, rnumber_bin);
       r=INT_TO_SR(ui);
     }

libpolys/coeffs/longrat.h

@@ -61 +61 @@
 number   nlInit2 (int i, int j, const coeffs r);
 number   nlInit2gmp (mpz_t i, mpz_t j);
+
+// number nlInitMPZ(mpz_t m, const coeffs r);
+// void nlMPZ(mpz_t m, number &n, const coeffs r);
+
 number   nlGcd(number a, number b, const coeffs r);
 number   nlLcm(number a, number b, const coeffs r);   /*special routine !*/
@@ -100 +104 @@
 extern omBin rnumber_bin;
 
-
 #define FREE_RNUMBER(x) omFreeBin((void *)x, rnumber_bin)
 #define ALLOC_RNUMBER() (number)omAllocBin(rnumber_bin)

libpolys/coeffs/longrat0.cc

@@ -10 +10 @@
 #include <stdio.h>
 #include <string.h>
+
 #include "config.h"
+#include <misc/auxiliary.h>
+
+#include <omalloc/omalloc.h>
 #include <reporter/reporter.h>
-#include <coeffs/coeffs.h>
-#include <omalloc/omalloc.h>
-#include <coeffs/longrat.h>
-#include <coeffs/numbers.h>
+
+#include "coeffs.h"
+#include "numbers.h"
+
+#include "longrat.h"
+
+/// Our Type!
+static const n_coeffType ID = n_Q;
+
+//#ifndef SI_THREADS
+omBin rnumber_bin = omGetSpecBin(sizeof(snumber)); // TODO: move this into coeffs-struct (for Q)?! 
+//#endif
+
 
 #define SR_HDL(A) ((long)(A))
@@ -143 +156 @@
 }
 
+

libpolys/coeffs/modulop.cc

@@ -632 +632 @@
   if(res->s==0)
     iz=(long)npDiv((number)iz,(number)in,dst_r);
-  omFreeBin((void *)res, rnumber_bin);
+  FREE_RNUMBER(res); // Q!?
   return (number)iz;
 }

libpolys/polys/clapconv.cc

@@ -356 +356 @@
       p_SetExp( term, i ,exp[i], r);
     //if (rRing_has_Comp(currRing)) p_SetComp(term, 0, currRing); // done by pInit
-    pGetCoeff(term)=(number)omAlloc0Bin(rnumber_bin);
+    pGetCoeff(term) = ALLOC0_RNUMBER(); // Q!?
     ((lnumber)pGetCoeff(term))->z=convFactoryPSingP( f, r->extRing );
     p_Setm( term,r );

libpolys/polys/templates/p_Numbers.h

@@ -76 +76 @@
 
 #define DO_LINLINE
-#include <coeffs/longrat.cc>
+#include <coeffs/longrat.cc> // TODO: fix this Uglyness?!!!
+
 #define n_Copy_FieldQ(n, r)        nlCopy(n, r->cf)
 #define n_Delete_FieldQ(n, r)      nlDelete(n,r->cf)