Changeset b30ac0 in git

Timestamp:

Apr 18, 2005, 3:01:40 PM (18 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

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

Children:

891692430d4d8e6deb884960d79f59f100ad77ce

Parents:

36e9c354d299283920e498516f0f8a0f1b1541af

Message:

*hannes: imap/pPerm


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

Location:

kernel

Files:

• longalg.cc (modified) (9 diffs)
• pDebug.cc (modified) (2 diffs)

kernel/longalg.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: longalg.cc,v 1.7 2005-02-25 16:10:52 Singular Exp $ */
+/* $Id: longalg.cc,v 1.8 2005-04-18 13:01:39 Singular Exp $ */
 /*
 * ABSTRACT:   algebraic numbers
@@ -2101 +2101 @@
       if (p==NULL)
       {
-        napDelete(&w);
+        p_Delete(&w,nacRing);
         return NULL;
       }
@@ -2237 +2237 @@
 * convert a napoly number into a poly
 */
-poly naPermNumber(number z, int * par_perm, int P, ring r)
+poly naPermNumber(number z, int * par_perm, int P, ring oldRing)
 {
   if (z==NULL) return NULL;
@@ -2244 +2244 @@
   napoly za=((lnumber)z)->z;
   napoly zb=((lnumber)z)->n;
-  nMapFunc nMap=naSetMap(r,currRing);
+  nMapFunc nMap=naSetMap(oldRing,currRing);
   if (currRing->parameter!=NULL)
-    nMap=currRing->algring->cf->cfSetMap(r->algring, nacRing);
+    nMap=currRing->algring->cf->cfSetMap(oldRing->algring, nacRing);
   else
-    nMap=currRing->cf->cfSetMap(r->algring, currRing);
+    nMap=currRing->cf->cfSetMap(oldRing->algring, currRing);
   if (nMap==NULL) return NULL; /* emergency exit only */
   do
@@ -2263 +2263 @@
     if (currRing->parameter!=NULL)
     {
-      assume(r->algring!=NULL);
+      assume(oldRing->algring!=NULL);
       pGetCoeff(p)=(number)omAlloc0Bin(rnumber_bin);
       pan=(lnumber)pGetCoeff(p);
@@ -2276 +2276 @@
     for(i=0;i<P;i++)
     {
-      if(napGetExpFrom(za,i+1,r)!=0)
+      if(napGetExpFrom(za,i+1,oldRing)!=0)
       {
         if(par_perm==NULL)
@@ -2282 +2282 @@
           if ((rPar(currRing)>=i) && (pa!=NULL))
           {
-            napSetExp(pa,i+1,napGetExpFrom(za,i+1,r));
+            napSetExp(pa,i+1,napGetExpFrom(za,i+1,oldRing));
             p_Setm(pa,nacRing);
           }
@@ -2292 +2292 @@
         }
         else if(par_perm[i]>0)
-          pSetExp(p,par_perm[i],napGetExpFrom(za,i+1,r));
+          pSetExp(p,par_perm[i],napGetExpFrom(za,i+1,oldRing));
         else if((par_perm[i]<0)&&(pa!=NULL))
         {
-          napSetExp(pa,-par_perm[i], napGetExpFrom(za,i+1,r));
+          napSetExp(pa,-par_perm[i], napGetExpFrom(za,i+1,oldRing));
           p_Setm(pa,nacRing);
         }
@@ -2310 +2310 @@
       if (zb!=NULL)
       {
-        pan->n=napPerm(zb,par_perm,r,nMap);
+        pan->n=napPerm(zb,par_perm,oldRing,nMap);
         if(pan->n==NULL) /* error in mapping or mapping to variable */
           pDelete(&p);

kernel/pDebug.cc

@@ -7 +7 @@
  *  Author:  obachman (Olaf Bachmann)
  *  Created: 8/00
- *  Version: $Id: pDebug.cc,v 1.1.1.1 2003-10-06 12:15:57 Singular Exp $
+ *  Version: $Id: pDebug.cc,v 1.2 2005-04-18 13:01:40 Singular Exp $
  *******************************************************************/
 
@@ -234 +234 @@
 
     // special check for ringorder_s/S
-    if (r->order[1] == ringorder_S)
+    if ((r->order!=NULL) &&(r->order[1] == ringorder_S))
     {
       long c1, cc1, ccc1, ec1;