Changeset eaf66f in git

Timestamp:

Jan 6, 2010, 3:55:24 PM (13 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

2798e9c9a20190bf0a37493b0ee9bb022d2b226f

Parents:

098f98f02a8e2828b475a241c0b7cfc3fb3c8e01

Message:

IDTYP etc -> ipid.h

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

Location:

Singular

Files:

• fglm.cc (modified) (1 diff)
• ipid.h (modified) (3 diffs)
• walk.cc (modified) (2 diffs)
• walk_ip.cc (modified) (2 diffs)

Singular/fglm.cc

@@ -299 +299 @@
                 // Now the settings are compatible with FGLM
                 assumeStdFlag( (leftv)ih );
-                if ( fglmzero( sourceRingHdl, sourceIdeal, destRingHdl, destIdeal, FALSE, (currQuotient != NULL) ) == FALSE )
+                if ( fglmzero( IDRING(sourceRingHdl), sourceIdeal, destRingHdl, destIdeal, FALSE, (currQuotient != NULL) ) == FALSE )
                     state= FglmNotReduced;
             }

Singular/ipid.h

@@ -42 +42 @@
 }
 
-class proclevel {
+class proclevel
+{
   public:
   proclevel * next;
@@ -66 +67 @@
 
 
-/*extern idhdl      currRingHdl; in structs.h */
-/*extern ring     currRing;  in structs.h */
+/*extern idhdl      currRingHdl; in ring.h */
+/*extern ring     currRing;  in ring.h */
 /*extern ideal      currQuotient; in structs.h */
 
@@ -90 +91 @@
 void ipListFlag(idhdl h);
 
+
+#define IDNEXT(a)    ((a)->next)
+#define IDTYP(a)     ((a)->typ)
+#define IDFLAG(a)    ((a)->flag)
+#define IDLEV(a)     ((a)->lev)
+#define IDID(a)      ((a)->id)
+#define IDATTR(a)    ((a)->attribute)
+
+#define IDINT(a)    ((int)(long)((a)->data.ustring))
+#define IDDATA(a)   ((a)->data.ustring)
+#define IDRING(a)   ((a)->data.uring)
+#define IDINTVEC(a) ((a)->data.iv)
+#define IDPOLY(a)   ((a)->data.p)
+#define IDBIGINT(a) ((a)->data.n)
+#define IDNUMBER(a) ((a)->data.n)
+#define IDIDEAL(a)  ((a)->data.uideal)
+#define IDMATRIX(a) ((a)->data.umatrix)
+#define IDMAP(a)    ((a)->data.umap)
+#define IDSTRING(a) ((a)->data.ustring)
+#define IDLIST(a)   ((a)->data.l)
+#define IDLINK(a)   ((a)->data.li)
+#define IDPACKAGE(a) ((a)->data.pack)
+#define IDPROC(a)   ((a)->data.pinf)
+
 #ifndef OM_ALLOC_H
 struct omBin_s;

Singular/walk.cc

@@ -1945 +1945 @@
   int nb = rBlocks(currRing) + 1;
 
-  ring res=(ring)omAllocBin(ip_sring_bin);
+  ring res=(ring)omAllocBin(sip_sring_bin);
 
   memcpy4(res,currRing,sizeof(ip_sring));
@@ -2024 +2024 @@
   int i, nv = currRing->N;
 
-  ring r=(ring)omAllocBin(ip_sring_bin);
+  ring r=(ring)omAllocBin(sip_sring_bin);
 
   memcpy4(r,currRing,sizeof(ip_sring));

Singular/walk_ip.cc

@@ -76 +76 @@
     {
       int * vperm = (int *)omAlloc0( (pVariables+1)*sizeof( int ) );
-      state= walkConsistency( sourceRingHdl, destRingHdl, vperm );
+      state= walkConsistency( IDRING(sourceRingHdl), IDRING(destRingHdl), vperm );
       omFreeSize( (ADDRESS)vperm, (pVariables+1)*sizeof(int) );
     }
@@ -188 +188 @@
 
     int * vperm = (int *)omAlloc0( (pVariables+1)*sizeof( int ) );
-    state= fractalWalkConsistency( sourceRingHdl, destRingHdl, vperm );
+    state= fractalWalkConsistency( IDRING(sourceRingHdl), IDRING(destRingHdl), vperm );
     omFreeSize( (ADDRESS)vperm, (pVariables+1)*sizeof(int) );