Changeset 21dc6a in git

Timestamp:

Jun 18, 2010, 9:57:57 AM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

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

Children:

87d61c10ec6e427676a71fd4d72c3b8061a208c5

Parents:

c681afb9b03a6747aa621c213d570c03bc5bdeeb

git-author:

Frank Seelisch <seelisch@murrumesh.mathematik.uni-kl.de>2010-06-18 09:57:57+02:00

git-committer:

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

Message:

changes in rmodulon and rmodulo2m etc. but does not compile yet due to
linker problems(?)

Location:

coeffs

Files:

• coeffs.h (modified) (1 diff, 1 prop)
• numbers.cc (modified) (1 diff, 1 prop)
• rmodulo2m.cc (modified) (1 diff, 1 prop)
• rmodulo2m.h (modified) (1 diff, 1 prop)
• rmodulon.cc (modified) (1 diff, 1 prop)
• rmodulon.h (modified) (1 diff, 1 prop)
• test.cc (modified) (4 diffs, 1 prop)

coeffs/coeffs.h

@@ -27 +27 @@
   // only used if HAVE_RINGS is defined
   n_Z,
-  n_Zm,
-  n_Zpn,
-  n_Z2n
+  n_Zn,
+  n_Zpn, // does no longer exist?
+  n_Z2m
 };
 

coeffs/numbers.cc

@@ -103 +103 @@
 #endif
 
-static n_coeffType nLastCoeffs=n_Z2n;
+static n_coeffType nLastCoeffs=n_Z2m;
 static cfInitCharProc *nInitCharTable=NULL;
 /*2

coeffs/rmodulo2m.cc

@@ -24 +24 @@
 
 /* for initializing function pointers */
-void nr2mCoeffInit (n_Procs_s *n, int c, const coeffs r)
+void nr2mInitChar (coeffs r, void*)
 {
      nr2mInitExp(c, r);
-     n->cfInit  = nr2mInit;
-     n->cfCopy = nr2mCopy;
-     n->n_Int  = nr2mInt;
-     n->nAdd   = nr2mAdd;
-     n->nSub   = nr2mSub;
-     n->nMult  = nr2mMult;
-     n->nDiv   = nr2mDiv;
-     n->nIntDiv       = nr2mIntDiv;
-     n->nIntMod=nr2mMod;
-     n->nExactDiv= nr2mDiv;
-     n->nNeg   = nr2mNeg;
-     n->nInvers= nr2mInvers;
-     n->nDivBy = nr2mDivBy;
-     n->nDivComp = nr2mDivComp;
-     n->nGreater = nr2mGreater;
-     n->nEqual = nr2mEqual;
-     n->nIsZero = nr2mIsZero;
-     n->nIsOne = nr2mIsOne;
-     n->nIsMOne = nr2mIsMOne;
+     n->cfInit       = nr2mInit;
+     n->cfCopy       = nr2mCopy;
+     n->n_Int        = nr2mInt;
+     n->nAdd         = nr2mAdd;
+     n->nSub         = nr2mSub;
+     n->nMult        = nr2mMult;
+     n->nDiv         = nr2mDiv;
+     n->nIntDiv      = nr2mIntDiv;
+     n->nIntMod      = nr2mMod;
+     n->nExactDiv    = nr2mDiv;
+     n->nNeg         = nr2mNeg;
+     n->nInvers      = nr2mInvers;
+     n->nDivBy       = nr2mDivBy;
+     n->nDivComp     = nr2mDivComp;
+     n->nGreater     = nr2mGreater;
+     n->nEqual       = nr2mEqual;
+     n->nIsZero      = nr2mIsZero;
+     n->nIsOne       = nr2mIsOne;
+     n->nIsMOne      = nr2mIsMOne;
      n->nGreaterZero = nr2mGreaterZero;
-     n->cfWrite = nr2mWrite;
-     n->nRead = nr2mRead;
-     n->nPower = nr2mPower;
-     n->cfSetMap = nr2mSetMap;
-     n->nNormalize = ndNormalize;
-     n->nLcm          = nr2mLcm;
-     n->nGcd          = nr2mGcd;
-     n->nIsUnit = nr2mIsUnit;
-     n->nGetUnit = nr2mGetUnit;
-     n->nExtGcd = nr2mExtGcd;
-     n->nName= ndName;
+     n->cfWrite      = nr2mWrite;
+     n->nRead        = nr2mRead;
+     n->nPower       = nr2mPower;
+     n->cfSetMap     = nr2mSetMap;
+     n->nNormalize   = ndNormalize;
+     n->nLcm         = nr2mLcm;
+     n->nGcd         = nr2mGcd;
+     n->nIsUnit      = nr2mIsUnit;
+     n->nGetUnit     = nr2mGetUnit;
+     n->nExtGcd      = nr2mExtGcd;
+     n->nName        = ndName;
 #ifdef LDEBUG
-     n->nDBTest=nr2mDBTest;
+     n->nDBTest      = nr2mDBTest;
 #endif
 }

coeffs/rmodulo2m.h

@@ -15 +15 @@
                                bit pattern '11..1' of length m */
 
-/* next method is for initializing function pointers */
-void    nr2mCoeffInit   (n_Procs_s *n, int c, const coeffs r);
-
+void    nr2mInitChar    (coeffs r, void*);
 number  nr2mCopy        (number a, const coeffs r);
 BOOLEAN nr2mGreaterZero (number k, const coeffs r);

coeffs/rmodulon.cc

@@ -27 +27 @@
 
 /* for initializing function pointers */
-void nrnCoeffInit (n_Procs_s *n, int c, const coeffs r)
+void nrnInitChar (coeffs r, void*)
 {
      nrnInitExp(c, r);
-     n->cfInit  = nrnInit;
-     n->cfDelete= nrnDelete;
-     n->cfCopy = nrnCopy;
-     n->nSize  = nrnSize;
-     n->n_Int  = nrnInt;
-     n->nAdd   = nrnAdd;
-     n->nSub   = nrnSub;
-     n->nMult  = nrnMult;
-     n->nDiv   = nrnDiv;
-     n->nIntDiv= nrnIntDiv;
-     n->nIntMod= nrnMod;
-     n->nExactDiv= nrnDiv;
-     n->nNeg   = nrnNeg;
-     n->nInvers= nrnInvers;
-     n->nDivBy = nrnDivBy;
-     n->nDivComp = nrnDivComp;
-     n->nGreater = nrnGreater;
-     n->nEqual = nrnEqual;
-     n->nIsZero = nrnIsZero;
-     n->nIsOne = nrnIsOne;
-     n->nIsMOne = nrnIsMOne;
+     n->cfInit       = nrnInit;
+     n->cfDelete     = nrnDelete;
+     n->cfCopy       = nrnCopy;
+     n->nSize        = nrnSize;
+     n->n_Int        = nrnInt;
+     n->nAdd         = nrnAdd;
+     n->nSub         = nrnSub;
+     n->nMult        = nrnMult;
+     n->nDiv         = nrnDiv;
+     n->nIntDiv      = nrnIntDiv;
+     n->nIntMod      = nrnMod;
+     n->nExactDiv    = nrnDiv;
+     n->nNeg         = nrnNeg;
+     n->nInvers      = nrnInvers;
+     n->nDivBy       = nrnDivBy;
+     n->nDivComp     = nrnDivComp;
+     n->nGreater     = nrnGreater;
+     n->nEqual       = nrnEqual;
+     n->nIsZero      = nrnIsZero;
+     n->nIsOne       = nrnIsOne;
+     n->nIsMOne      = nrnIsMOne;
      n->nGreaterZero = nrnGreaterZero;
-     n->cfWrite = nrnWrite;
-     n->nRead = nrnRead;
-     n->nPower = nrnPower;
-     n->cfSetMap = nrnSetMap;
-     n->nNormalize = ndNormalize;
-     n->nLcm          = nrnLcm;
-     n->nGcd          = nrnGcd;
-     n->nIsUnit = nrnIsUnit;
-     n->nGetUnit = nrnGetUnit;
-     n->nExtGcd = nrnExtGcd;
-     n->nName= nrnName;
+     n->cfWrite      = nrnWrite;
+     n->nRead        = nrnRead;
+     n->nPower       = nrnPower;
+     n->cfSetMap     = nrnSetMap;
+     n->nNormalize   = ndNormalize;
+     n->nLcm         = nrnLcm;
+     n->nGcd         = nrnGcd;
+     n->nIsUnit      = nrnIsUnit;
+     n->nGetUnit     = nrnGetUnit;
+     n->nExtGcd      = nrnExtGcd;
+     n->nName        = nrnName;
 #ifdef LDEBUG
-     n->nDBTest=nrnDBTest;
+     n->nDBTest      = nrnDBTest;
 #endif
 }

coeffs/rmodulon.h

@@ -15 +15 @@
 #endif
 
-/* next method is for initializing function pointers */
-void    nrnCoeffInit   (n_Procs_s *n, int c, const coeffs r);
-
+void    nrnInitChar    (coeffs r, void*);
 number  nrnCopy        (number a, const coeffs r);
 int     nrnSize        (number a, const coeffs r);

coeffs/test.cc

@@ -7 +7 @@
 #include <omalloc.h>
 
-
 #include <longrat.h>
 #include <gnumpc.h>
 #include <shortfl.h>
-
+#include <rmodulon.h>
+#include <rmodulo2m.h>
 
 #include <iostream>
@@ -24 +24 @@
   number b = n_Add(a, a, r);
   n_Test(b,r);
-  
+
   StringSetS("a: "); n_Write(a, r);PrintS(StringAppend("\n"));
   StringSetS("b: "); n_Write(b, r);PrintS(StringAppend("\n"));
@@ -75 +75 @@
     assume( r->cfAdd == nrAdd );
 //    assume( r->cfDelete == nrDelete ); // No?
-  } else
+  }
+  else if( type == n_Z2m )
+  {
+    assume( r->cfInit == nr2mInit );
+    assume( r->cfWrite == nr2mWrite );
+    assume( r->cfAdd == nr2mAdd );
+    assume( r->cfDelete == nr2mDelete );
+  }
+  else if( type == n_Zn )
+  {
+    assume( r->cfInit == nrnInit );
+    assume( r->cfWrite == nnrWrite );
+    assume( r->cfAdd == nnrAdd );
+    assume( r->cfDelete == nnrDelete );
+  }
+  else
   {
     // ...
@@ -109 +124 @@
     c ++;
 
+  type = nRegister( n_Zn, nrnInitChar); assume( type == n_Zn );
+  if( Test(type) )
+    c ++;
+  
+  type = nRegister( n_Z2m, nr2mInitChar); assume( type == n_Z2m );
+  if( Test(type) )
+    c ++;
+
   return c;