Changeset ec997eb in git

Timestamp:

Jun 23, 2010, 5:30:26 PM (14 years ago)

Author:

Martin Lee <martinlee84@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

9306a018288373a7ff57e28d75220387d5ade91b

Parents:

bec902b0ffacb3e2e367c56db0c72b92c58d06d5

git-author:

Martin Lee <martinlee84@web.de>2010-06-23 17:30:26+02:00

git-committer:

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

Message:

more changes to rinteger

Location:

coeffs

Files:

• rintegers.cc (modified) (4 diffs)
• rintegers.h (modified) (2 diffs)

coeffs/rintegers.cc

@@ -115 +115 @@
 }
 
-int nrzSize(number a)
+int nrzSize(number a, const coeffs r)
 {
   if (a == NULL) return 0;
@@ -312 +312 @@
 
 #ifdef LDEBUG
-//BOOLEAN nrzDBTest (number a, const char *f, const int l)
-//{
-//  return TRUE;//TODO
-//}
+BOOLEAN nrzDBTest (number a, const char *f, const int l, const coeffs r)
+{
+  return TRUE;//TODO
+}
 #endif
 
@@ -362 +362 @@
 }
 
-const char * nrzRead (const char *s, number *a)
+const char * nrzRead (const char *s, number *a, const coeffs r)
 {
   int_number z = (int_number) omAllocBin(gmp_nrz_bin);
@@ -372 +372 @@
   return s;
 }
+
+void nrzInitChar(coeffs r,  void * parameter)
+{
+  r->cfSetChar= NULL;
+  r->cfMult  = nrzMult;
+  r->cfSub   = nrzSub;
+  r->cfAdd   = nrzAdd;
+  r->cfDiv   = nrzDiv;
+  r->cfIntDiv= nrzDiv;
+  r->cfIntMod= nrzIntMod;
+  r->cfExactDiv= nrzDiv;
+  r->cfInit = nrzInit;
+  r->cfSize  = nrzSize;
+  r->cfInt  = nrzInt;
+  #ifdef HAVE_RINGS
+  r->cfDivComp = nrzDivComp; // only for ring stuff
+  r->cfIsUnit = nrzIsUnit; // only for ring stuff
+  r->cfGetUnit = nrzGetUnit; // only for ring stuff
+  r->cfExtGcd = nrzExtGcd; // only for ring stuff
+  r->cfDivBy = nrzDivBy; // only for ring stuff
+  #endif
+  r->cfNeg   = nrzNeg;
+  r->cfInvers= nrzInvers;
+  r->cfCopy  = nrzCopy;
+  //r->cfRePart = ndCopy;
+  //r->cfImPart = ndReturn0;
+  r->cfWrite = nrzWrite;
+  r->cfRead = nrzRead;
+  //r->cfNormalize=ndNormalize;
+  r->cfGreater = nrzGreater;
+  r->cfEqual = nrzEqual;
+  r->cfIsZero = nrzIsZero;
+  r->cfIsOne = nrzIsOne;
+  r->cfIsMOne = nrzIsMOne;
+  r->cfGreaterZero = nrzGreaterZero;
+  r->cfPower = nrzPower;
+  r->cfGcd  = nrzGcd;
+  r->cfLcm  = nrzGcd;
+  r->cfDelete= nrzDelete;
+  r->cfSetMap = nrzSetMap;
+  //r->cfName = nrzName;
+  // debug stuff
+
+#ifdef LDEBUG
+  r->cfDBTest=nrzDBTest;
 #endif
+ 
+  r->has_simple_Alloc=TRUE;
+  r->has_simple_Inverse=TRUE; 
+}
+
+#endif

coeffs/rintegers.h

@@ -14 +14 @@
 extern NATNUMBER nrzModul;
 
-number  nrzCopy       (number a, const coeffs r);
-int     nrzSize        (number a);
+void    nrzInitChar    (coeffs r,  void * parameter);
+number  nrzCopy        (number a, const coeffs r);
+int     nrzSize        (number a, const coeffs r);
 void    nrzDelete      (number *a, const coeffs r);
 BOOLEAN nrzGreaterZero (number k, const coeffs r);
@@ -43 +44 @@
 nMapFunc nrzSetMap     (const coeffs src, const coeffs dst);
 void    nrzWrite       (number &a, const coeffs r);
-const char *  nrzRead  (const char *s, number *a);
-char *  nrzName        (number n);
+const char *  nrzRead  (const char *s, number *a, const coeffs r);
+char *  nrzName        (number n, const coeffs r);
 #ifdef LDEBUG
-BOOLEAN nrzDBTest      (number a, const char *f, const int l);
+BOOLEAN nrzDBTest      (number a, const char *f, const int l, const coeffs r);
 #endif
 void    nrzSetExp(int c, coeffs r);