Changeset 85d8bee in git

Timestamp:

Jun 18, 2010, 5:57:47 PM (13 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

e5ffec70440370de33da3fa2773669fe8e35d684

Parents:

8e124676cbdd85ab8774665bf2a182e8c34b5450

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-06-18 17:57:47+02:00

git-committer:

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

Message:

HAVE_RING fixes

File:

• coeffs/rintegers.cc (modified) (15 diffs)

coeffs/rintegers.cc

@@ -8 +8 @@
 
 #include <string.h>
-#include <kernel/mod2.h>
-#include <omalloc/mylimits.h>
-#include <kernel/structs.h>
-#include <kernel/febase.h>
-#include <omalloc/omalloc.h>
-#include <kernel/numbers.h>
-#include <kernel/longrat.h>
-#include <kernel/mpr_complex.h>
-#include <kernel/ring.h>
-#include <kernel/rintegers.h>
-#include <kernel/si_gmp.h>
+#include <auxiliary.h>
+#include <mylimits.h>
+#include "coeffs.h"
+#include <reporter.h>
+#include <omalloc.h>
+#include "numbers.h"
+#include "longrat.h"
+#include "mpr_complex.h"
+#include "rintegers.h"
+#include <si_gmp.h>
 
 #ifdef HAVE_RINGS
@@ -38 +37 @@
  * Give the smallest non unit k, such that a * x = k = b * y has a solution
  */
-number nrzLcm (number a,number b,ring r)
+number nrzLcm (number a,number b,const coeffs r)
 {
   int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
@@ -50 +49 @@
  * a solution.
  */
-number nrzGcd (number a,number b,ring r)
+number nrzGcd (number a,number b,const coeffs r)
 {
   int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
@@ -87 +86 @@
  * create a number from int
  */
-number nrzInit (int i, const ring r)
+number nrzInit (int i, const coeffs r)
 {
   int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
@@ -94 +93 @@
 }
 
-void nrzDelete(number *a, const ring r)
+void nrzDelete(number *a, const coeffs r)
 {
   if (*a == NULL) return;
@@ -102 +101 @@
 }
 
-number nrzCopy(number a)
+number nrzCopy(number a, const coeffs r)
 {
   int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
@@ -109 +108 @@
 }
 
-number cfrzCopy(number a, const ring r)
-{
-  return nrzCopy(a);
+number nrzCopyMap(number a, const coeffs src, const coeffs dst)
+{
+  return nrzCopy(a,dst);
 }
 
@@ -123 +122 @@
  * convert a number to int
  */
-int nrzInt(number &n, const ring r)
+int nrzInt(number &n, const coeffs r)
 {
   return (int) mpz_get_si( (int_number)n);
@@ -144 +143 @@
 }
 
-number  nrzGetUnit (number a)
-{
-  return nrzInit(1, currRing);
+number  nrzGetUnit (number a, const coeffs r)
+{
+  return nrzInit(1, r);
 }
 
@@ -253 +252 @@
 }
 
-number nrzMapMachineInt(number from)
+number nrzMapMachineInt(number from, const coeffs src, const coeffs dst)
 {
   int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
@@ -260 +259 @@
 }
 
-number nrzMapZp(number from)
+number nrzMapZp(number from, const coeffs src, const coeffs dst)
 {
   int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
@@ -267 +266 @@
 }
 
-number nrzMapQ(number from)
+number nrzMapQ(number from, const coeffs src, const coeffs dst)
 {
   int_number erg = (int_number) omAllocBin(gmp_nrz_bin);
@@ -275 +274 @@
 }
 
-nMapFunc nrzSetMap(const ring src, const ring dst)
+nMapFunc nrzSetMap(const coeffs src, const coeffs dst)
 {
   /* dst = currRing */
-  if (rField_is_Ring_Z(src) || rField_is_Ring_ModN(src) || rField_is_Ring_PtoM(src))
-  {
-    return nrzCopy;
-  }
-  if (rField_is_Ring_2toM(src))
+  if (nField_is_Ring_Z(src) || nField_is_Ring_ModN(src) || nField_is_Ring_PtoM(src))
+  {
+    return nrzCopyMap;
+  }
+  if (nField_is_Ring_2toM(src))
   {
     return nrzMapMachineInt;
   }
-  if (rField_is_Zp(src))
+  if (nField_is_Zp(src))
   {
     return nrzMapZp;
   }
-  if (rField_is_Q(src))
+  if (nField_is_Q(src))
   {
     return nrzMapQ;
@@ -302 +301 @@
  */
 
-void nrzSetExp(int m, ring r)
-{
-}
-
-void nrzInitExp(int m, ring r)
+void nrzSetExp(int m, coeffs r)
+{
+}
+
+void nrzInitExp(int m, coeffs r)
 {
 }
@@ -317 +316 @@
 #endif
 
-void nrzWrite (number &a, const ring r)
+void nrzWrite (number &a, const coeffs r)
 {
   char *s,*z;