Changeset bedece in git

Timestamp:

Oct 8, 2009, 10:30:14 AM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

aaeb98f1d8fde2cb5e6c22ea2a7379cb757bf46c

Parents:

2955bab23d4349e414d45420f8a98058e62645d1

Message:

*hannes: code simplification


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

File:

• kernel/longalg.cc (modified) (6 diffs)

kernel/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.53 2009-09-24 17:59:09 Singular Exp $ */
+/* $Id: longalg.cc,v 1.54 2009-10-08 08:30:14 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -166 +166 @@
 #define napSetCoeff(p,n) {nacDelete(&pGetCoeff(p),nacRing);pGetCoeff(p)=n;}
 #define napDelete1(p)    p_LmDelete((poly *)p, nacRing)
-#define nap_Copy(p,r)       (napoly)p_Copy((poly)p,r->algring)
 #define napComp(p,q)     p_LmCmp((poly)p,(poly)q, nacRing)
 #define napMultT(A,E)    A=(napoly)p_Mult_mm((poly)A,(poly)E,nacRing)
@@ -986 +985 @@
   lnumber src = (lnumber)p;
   erg = (lnumber)omAlloc0Bin(rnumber_bin);
-  erg->z = napCopy(src->z);
-  erg->n = napCopy(src->n);
+  erg->z = p_Copy(src->z, nacRing);
+  erg->n = p_Copy(src->n, nacRing);
   erg->s = src->s;
   return (number)erg;
@@ -997 +996 @@
   lnumber src = (lnumber)p;
   erg = (lnumber)omAlloc0Bin(rnumber_bin);
-  erg->z = nap_Copy(src->z,r);
-  erg->n = nap_Copy(src->n,r);
+  erg->z = p_Copy(src->z,r->algring);
+  erg->n = p_Copy(src->n,r->algring);
   erg->s = src->s;
   return (number)erg;
@@ -2417 +2416 @@
 number   naGetDenom(number &n, const ring r)
 {
-  //if (r==currRing) naNormalize(n);
   lnumber x=(lnumber)n;
   if (x->n!=NULL)
   {
     lnumber rr=(lnumber)omAlloc0Bin(rnumber_bin);
-    rr->z=nap_Copy(x->n,r);
+    rr->z=p_Copy(x->n,r->algring);
     rr->s = 2;
     return (number)rr;
@@ -2431 +2429 @@
 number   naGetNumerator(number &n, const ring r)
 {
-  //if (r==currRing) naNormalize(n);
   lnumber x=(lnumber)n;
   lnumber rr=(lnumber)omAlloc0Bin(rnumber_bin);
-  rr->z=nap_Copy(x->z,r);
+  rr->z=p_Copy(x->z,r->algring);
   rr->s = 2;
   return (number)rr;