Changeset bbf7a8 in git

Timestamp:

May 18, 2010, 3:21:14 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

719c71a80093859b748e9f65da9029c763e2f8d6

Parents:

b6f4bd27ea728a5ffe0529654d02f15c6f6fa2fe

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2010-05-18 15:21:14+02:00

git-committer:

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

Message:

init for Q

Location:

coeffs

Files:

• coeffs.h (modified) (1 diff)
• longrat.cc (modified) (4 diffs)
• numbers.cc (modified) (1 diff)

coeffs/coeffs.h

@@ -127 +127 @@
    /// Inline: a := b
    void    (*nInpMult)(number &a, number b, const coeffs r);
-   number  (*nInit_bigint)(number i, const coeffs src, const coeffs dummy);
+   /// maps the bigint i into the coeffs dst
+   number  (*nInit_bigint)(number i, const coeffs dst);
 
 #ifdef LDEBUG

coeffs/longrat.cc

@@ -293 +293 @@
   }
   number re=nlRInit(1);
-  mpz_set_d(&(re->z),f);
+  mpz_set_d(re->z,f);
   memcpy(&(re->n),&h1,sizeof(h1));
   re->s=0; /* not normalized */
@@ -370 +370 @@
   if (res->s==0)
     nlNormalize(res,dst);
-  else if (mpz_size1(&res->z)<=MP_SMALL)
+  else if (mpz_size1(res->z)<=MP_SMALL)
   {
     // res is new, res->ref is 1
@@ -2456 +2456 @@
   return z;
 }
+
+static BOOLEAN nlCoeffsEqual(const coeffs r, n_coeffType n, int parameter)
+{
+  /* test, if r is an instance of nInitCoeffs(n,parameter) */
+  return (n==n_Q);
+}
+
 void nlInitChar(coeffs r, int ch)
 {
-  r->cfInitChar=nlInitChar;
+  //r->cfInitChar=nlInitChar;
   r->cfKillChar=NULL;
   r->cfSetChar=NULL;
-
-  r->cfDelete= nlDelete;
-  r->nNormalize=nlNormalize;
-  r->cfInit = nlInit;
-  r->n_Int  = nlInt;
+  r->nCoeffIsEqual=nlCoeffsEqual;
+
+  r->nMult  = nlMult;
+  r->nSub   = nlSub;
   r->nAdd   = nlAdd;
-  r->nSub   = nlSub;
-  r->nMult  = nlMult;
-  r->nInpMult=nlInpMult;
   r->nDiv   = nlDiv;
-  r->nExactDiv= nlExactDiv;
   r->nIntDiv= nlIntDiv;
   r->nIntMod= nlIntMod;
+  r->nExactDiv= nlExactDiv;
+  r->cfInit = nlInit;
+  r->nPar = ndPar;
+  r->nParDeg = ndParDeg;
+  r->nSize  = nlSize;
+  r->n_Int  = nlInt;
+  #ifdef HAVE_RINGS
+  r->nDivComp = NULL; // only for ring stuff
+  r->nIsUnit = NULL; // only for ring stuff
+  r->nGetUnit = NULL; // only for ring stuff
+  r->nExtGcd = NULL; // only for ring stuff
+  #endif
   r->nNeg   = nlNeg;
   r->nInvers= nlInvers;
-  r->cfCopy  = nlCopy;
+  r->cfCopy  = nl_Copy;
+  r->nRePart = nl_Copy;
+  r->nImPart = ndReturn0;
+  r->cfWrite = nlWrite;
+  r->nRead = nlRead;
+  r->nNormalize=nlNormalize;
   r->nGreater = nlGreater;
+  #ifdef HAVE_RINGS
+  r->nDivBy = NULL; // only for ring stuff
+  #endif
   r->nEqual = nlEqual;
   r->nIsZero = nlIsZero;
@@ -2483 +2505 @@
   r->nIsMOne = nlIsMOne;
   r->nGreaterZero = nlGreaterZero;
-  r->cfWrite = nlWrite;
-  r->nRead = nlRead;
   r->nPower = nlPower;
+  r->cfGetDenom = nlGetDenom;
+  r->cfGetNumerator = nlGetNumerator;
   r->nGcd  = nlGcd;
   r->nLcm  = nlLcm;
+  r->cfDelete= nlDelete;
   r->cfSetMap = nlSetMap;
-  r->nSize  = nlSize;
-  r->cfGetDenom = nlGetDenom;
-  r->cfGetNumerator = nlGetNumerator;
+  r->nName = ndName;
+  r->nInpMult=nlInpMult;
+  r->nInit_bigint=nl_Copy;
 #ifdef LDEBUG
+  // debug stuff
   r->nDBTest=nlDBTest;
 #endif
+  
+  // the variables:
+  r->nNULL = INT_TO_SR(0);
+  r->type = n_Q;
+  r->ch = 0;
+  r->has_simple_Alloc=FALSE;
+  r->has_simple_Inverse=FALSE;
 }
 #if 0

coeffs/numbers.cc

@@ -113 +113 @@
 
   // not yet ready:
-  /*--------------------- Q -----------------*/
-  if (nField_is_Q(r))
-  {
-    r->nInit_bigint=nl_Copy;
-  }
   #if 0 /* vertagt*/
   /*--------------------- Q_a/ Zp_a -----------------*/