Changeset c58b53 in git

Timestamp:

Jan 9, 2004, 11:42:11 AM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

6ff51d4e0bf30c145d824a983a081195335affe1

Parents:

f12e3201d4cb3cb3d4a223172822b165f7a6c5cb

Message:

*hannes: imap


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

Location:

kernel

Files:

• longalg.h (modified) (2 diffs)
• polys1.cc (modified) (2 diffs)

kernel/longalg.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.h,v 1.1.1.1 2003-10-06 12:15:57 Singular Exp $ */
+/* $Id: longalg.h,v 1.2 2004-01-09 10:42:10 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -122 +122 @@
 #define napNew()               (p_Init(currRing->algring))
 #define napAdd(p1,p2)          (p_Add_q(p1,p2,currRing->algring))
+#define napSetm(p)             p_Setm(p,currRing->algring)
 #define nanumber               lnumber
 #define naGetNom0(na)          (((nanumber)(na))->z)

kernel/polys1.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: polys1.cc,v 1.1.1.1 2003-10-06 12:15:55 Singular Exp $ */
+/* $Id: polys1.cc,v 1.2 2004-01-09 10:42:11 Singular Exp $ */
 
 /*
@@ -921 +921 @@
             {
               lnumber c=(lnumber)pGetCoeff(qq);
-              napAddExp(c->z,-perm[i],e/*p_GetExp( p,i,oldRing)*/);
+              if (c->z->next==NULL)
+                napAddExp(c->z,-perm[i],e/*p_GetExp( p,i,oldRing)*/);
+              else /* more difficult: we have really to multiply: */
+              {
+                lnumber mmc=(lnumber)naInit(1);
+                napSetExp(mmc->z,-perm[i],e/*p_GetExp( p,i,oldRing)*/);
+                napSetm(mmc->z);
+                pGetCoeff(qq)=naMult((number)c,(number)mmc);
+                nDelete((number *)&c);
+                nDelete((number *)&mmc); 
+              }
               mapped_to_par=1;
             }