Changeset e803ec in git

Timestamp:

Jul 30, 2009, 1:49:09 PM (15 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6da93293a6bc47af4f1914d4fb0a58837982641d

Parents:

ea060104ee13bd3ee6905e6217bf3132876b9579

Message:

*hannes: numerator, denominator


git-svn-id: file:///usr/local/Singular/svn/trunk@12039 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

• longalg.cc (modified) (3 diffs)
• longalg.h (modified) (2 diffs)
• longrat.cc (modified) (2 diffs)
• longrat.h (modified) (2 diffs)
• numbers.cc (modified) (5 diffs)
• numbers.h (modified) (3 diffs)
• structs.h (modified) (2 diffs)

kernel/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.38 2008-08-22 11:56:55 Singular Exp $ */
+/* $Id: longalg.cc,v 1.39 2009-07-30 11:49:09 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -439 +439 @@
     if (has_denom)
     {
-      number den=nacRing->cf->n_GetDenom(napGetCoeff(p), nacRing);
+      number den=n_GetDenom(napGetCoeff(p), nacRing);
       kl=!n_IsOne(den,nacRing);
       n_Delete(&den, nacRing);
@@ -2463 +2463 @@
   return r->cf->nInit(1);
 }
+number   naGetNumerator(number &n, const ring r)
+{
+  if (r==currRing) naNormalize(n);
+  lnumber x=(lnumber)n;
+  if (x!=NULL)
+  {
+    lnumber rr=(lnumber)omAlloc0Bin(rnumber_bin);
+    rr->z=nap_Copy(naGetNom0(x),r);
+    rr->s = 2;
+    rr->cnt=0;
+    return (number)rr;
+  }
+  return NULL;
+}
 
 #ifdef LDEBUG

kernel/longalg.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.h,v 1.8 2008-03-19 17:44:09 Singular Exp $ */
+/* $Id: longalg.h,v 1.9 2009-07-30 11:49:09 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -94 +94 @@
 extern number   (*nacInit)(int i);
 extern void     (*nacNormalize)(number &a);
-extern void napWrite(napoly l,const BOOLEAN denom=TRUE);
-extern number   naGetDenom(number &n, const ring r);
+void napWrite(napoly l,const BOOLEAN denom=TRUE);
+number   naGetDenom(number &n, const ring r);
+number   naGetNumerator(number &n, const ring r);
 #endif
 

kernel/longrat.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longrat.cc,v 1.42 2009-07-16 16:01:26 Singular Exp $ */
+/* $Id: longrat.cc,v 1.43 2009-07-30 11:49:09 Singular Exp $ */
 /*
 * ABSTRACT: computation with long rational numbers (Hubert Grassmann)
@@ -1421 +1421 @@
 * acces to Nominator, nlCopy(n) for integers
 */
-number   nlGetNom(number &n, const ring r)
+number   nlGetNumerator(number &n, const ring r)
 {
   if (!(SR_HDL(n) & SR_INT))

kernel/longrat.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longrat.h,v 1.13 2008-08-06 13:55:42 Singular Exp $ */
+/* $Id: longrat.h,v 1.14 2009-07-30 11:49:09 Singular Exp $ */
 /*
 * ABSTRACT: computation with long rational numbers
@@ -84 +84 @@
 int      nlSize(number n);
 number   nlGetDenom(number &n, const ring r);
-number   nlGetNom(number &n, const ring r);
+number   nlGetNumerator(number &n, const ring r);
 number   nlChineseRemainder(number *x, number *q,int rl);
 #ifdef LDEBUG

kernel/numbers.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR      *
 *****************************************/
-/* $Id: numbers.cc,v 1.23 2009-07-03 13:14:10 seelisch Exp $ */
+/* $Id: numbers.cc,v 1.24 2009-07-30 11:49:09 Singular Exp $ */
 
 /*
@@ -111 +111 @@
 
 number ndGetDenom(number &n, const ring r) { return n_Init(1,r); }
+number ndGetNumerator(number &a,const ring r) { return r->cf->nCopy(a); }
 
 int ndSize(number a) { return (int)nIsZero(a)==FALSE; }
@@ -297 +298 @@
   n->nParDeg=ndParDeg;
   n->nSize = ndSize;
-  n->n_GetDenom= ndGetDenom;
+  n->cfGetDenom= ndGetDenom;
+  n->cfGetNumerator= ndGetNumerator;
   n->nName =  ndName;
   n->nImPart=ndReturn0;
@@ -349 +351 @@
     n->nName       = naName;
     n->nSize       = naSize;
-    n->n_GetDenom   = naGetDenom;
+    n->cfGetDenom   = naGetDenom;
+    n->cfGetNumerator= naGetNumerator;
 #ifdef LDEBUG
     n->nDBTest     = naDBTest;
@@ -510 +513 @@
     n->cfSetMap = nlSetMap;
     n->nSize  = nlSize;
-    n->n_GetDenom = nlGetDenom;
+    n->cfGetDenom = nlGetDenom;
+    n->cfGetNumerator = nlGetNumerator;
 #ifdef LDEBUG
     n->nDBTest=nlDBTest;

kernel/numbers.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: numbers.h,v 1.16 2008-12-08 17:47:35 Singular Exp $ */
+/* $Id: numbers.h,v 1.17 2009-07-30 11:49:09 Singular Exp $ */
 /*
 * ABSTRACT: interface to coefficient aritmetics
@@ -35 +35 @@
 #define n_Power(a, b, res, r) (r)->cf->nPower(a,b,res)
 #define n_Size(n,r)           (r)->cf->nSize(n)
+#define n_GetDenom(N,r)       (r)->cf->cfGetDenom((N),r)
+#define n_GetNumerator(N,r)   (r)->cf->cfGetNumerator((N),r)
 
 #define n_New(n, r)           (r)->cf->nNew(n)
@@ -83 +85 @@
 #define nTest(a) (1)
 #define nDelete(A) (currRing)->cf->cfDelete(A,currRing)
-#define nGetDenom(N) (currRing->cf->n_GetDenom((N),currRing))
+#define nGetDenom(N) (currRing->cf->cfGetDenom((N),currRing))
+#define nGetNumerator(N) (currRing->cf->cfGetNumerator((N),currRing))
 
 #define nSetMap(R) (currRing->cf->cfSetMap(R,currRing))

kernel/structs.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: structs.h,v 1.63 2009-07-28 14:15:05 Singular Exp $ */
+/* $Id: structs.h,v 1.64 2009-07-30 11:49:09 Singular Exp $ */
 /*
 * ABSTRACT
@@ -305 +305 @@
            (*nGreaterZero)(number a);
    void    (*nPower)(number a, int i, number * result);
-   number  (*n_GetDenom)(number &n, const ring r);
+   number  (*cfGetDenom)(number &n, const ring r);
+   number  (*cfGetNumerator)(number &n, const ring r);
    number  (*nGcd)(number a, number b, const ring r);
    number  (*nLcm)(number a, number b, const ring r);