Changeset fa31d2 in git

Timestamp:

May 6, 2010, 11:15:04 AM (14 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

b669e0bd18e9a750640efa52441c348c0ebd1408

Parents:

193c6b995c05e74875bad7b738f4df3d5aa7f969

git-author:

Christian Eder <ederc@mathematik.uni-kl.de>2010-05-06 11:15:04+02:00

git-committer:

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

Message:

changed mappings in longrat*: added src & dst, assumes

Files:

• coeffs/Makefile~ (added)
• coeffs/longrat.cc (modified) (6 diffs)
• coeffs/longrat.cc~ (added)
• coeffs/longrat.h (modified) (1 diff)
• coeffs/longrat.h~ (added)
• coeffs/utils.h (deleted)
• misc/aux.h (modified) (1 diff)
• misc/aux.h~ (added)

coeffs/longrat.cc

@@ -109 +109 @@
 void    _nlDelete_NoImm(number *a);
 
+static const n_coeffType ID = n_long_R;
+
 /***************************************************************
  *
@@ -140 +142 @@
 #endif
 
-static number nlMapP(number from, const coeffs src, const coeffs r)
-{
+static number nlMapP(number from, const coeffs src, const coeffs dst)
+{
+  assume( getCoeffType(dst) == ID );
+  assume( getCoeffType(src) == n_Zp );
+  
   number to;
-  to = nlInit(npInt(from,src), r);
+  to = nlInit(npInt(from,src), dst);
   return to;
 }
 
-static number nlMapLongR(number from, const coeffs r);
-static number nlMapR(number from, const coeffs r);
+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
@@ -267 +272 @@
 static number nlMapR(number from, const coeffs src, const coeffs dst)
 {
+  assume( getCoeffType(dst) == ID );
+  assume( getCoeffType(src) == n_R );
+  
   double f=nrFloat(from);
   if (f==0.0) return INT_TO_SR(0);
@@ -295 +303 @@
 static number nlMapLongR(number from, const coeffs src, const coeffs dst) 
 {
+  assume( getCoeffType(dst) == ID );
+  assume( getCoeffType(src) == n_long_R );
+  
   gmp_float *ff=(gmp_float*)from;
   mpf_t *f=ff->_mpfp();
@@ -1891 +1902 @@
 
 /*2
-* copy a to b for ampping
-*/
-number nlCopyMap(number a, const coeffs rc, const coeffs r)
-{
+* copy a to b for mapping
+*/
+number nlCopyMap(number a, const coeffs src, const coeffs dst)
+{
+  assume( getCoeffType(dst) == ID );
+  assume( getCoeffType(src) == ID );
+  
   if ((SR_HDL(a) & SR_INT)||(a==NULL))
   {
@@ -1903 +1917 @@
 nMapFunc nlSetMap(const coeffs src, const coeffs dst)
 {
+  assume( getCoeffType(dst) == ID );
+  assume( getCoeffType(src) == ID );
+  
   if (nField_is_Q(src))
   {

coeffs/longrat.h

@@ -11 +11 @@
 #include "config.h"
 #include "si_gmp.h"
+#include <aux.h>
 
 typedef MP_INT lint;

misc/aux.h

@@ -42 +42 @@
 #define loop for(;;)
 
+static inline int si_max(const int a, const int b)  { return (a>b) ? a : b; }
+
+
 #if defined(SI_CPU_I386) || defined(SI_CPU_X86_64)
   // the following settings seems to be better on i386 and x86_64 processors