Changeset 098f98f in git

Timestamp:

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

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

eaf66fe9969d8b8c2cf369ea94e7616f379a3229

Parents:

b46774f2ffde4294abff59d9fdb51d1914924c72

Message:

IDTYP etc -> ipid.h

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

Location:

kernel

Files:

• fglm.h (modified) (1 diff)
• fglmzero.cc (modified) (9 diffs)
• misc.cc (modified) (1 diff)
• ring.cc (modified) (8 diffs)
• structs.h (modified) (2 diffs)
• walkProc.cc (modified) (2 diffs)
• walkProc.h (modified) (1 diff)
• walkSupport.cc (modified) (1 diff)

kernel/fglm.h

@@ -82 +82 @@
 // if deleteIdeal==FALSE, then nothing happens to sourceIdeal
 BOOLEAN
-fglmzero( idhdl sourceRingHdl, ideal & sourceIdeal, idhdl destRingHdl, ideal & destideal, BOOLEAN switchBack = TRUE, BOOLEAN deleteIdeal = FALSE );
+fglmzero( ring sourceRing, ideal & sourceIdeal, idhdl destRingHdl, ideal & destideal, BOOLEAN switchBack = TRUE, BOOLEAN deleteIdeal = FALSE );
 
 BOOLEAN

kernel/fglmzero.cc

@@ -30 +30 @@
 #include "omalloc.h"
 #include "kstd1.h" // for kNF (see fglmquot)
-#include "intvec.h" 
+#include "intvec.h"
 #include "fglm.h"
 #include "fglmvec.h"
@@ -593 +593 @@
 void
 internalCalculateFunctionals( const ideal & theIdeal, idealFunctionals & l,
-                              fglmSdata & data )
+                              fglmSdata & data )
 {
 
@@ -663 +663 @@
 static BOOLEAN
 CalculateFunctionals( const ideal & theIdeal, idealFunctionals & l,
-                      poly & p, fglmVector & v )
+                      poly & p, fglmVector & v )
 {
     fglmSdata data( theIdeal );
@@ -669 +669 @@
     //    STICKYPROT("Calculating vector rep\n");
     v = data.getVectorRep( p );
-    // if ( v.isZero() ) 
+    // if ( v.isZero() )
     //   STICKYPROT("vectorrep is 0\n");
     return ( data.state() );
@@ -1019 +1019 @@
 static ideal
 GroebnerViaFunctionals( const idealFunctionals & l,
-                        fglmVector iv = fglmVector() )
+                        fglmVector iv = fglmVector() )
 // If iv is zero, calculates the groebnerBasis for the ideal which is
 // defined by l.
@@ -1039 +1039 @@
       initv = iv;
     }
-      
+
     poly one = pOne();
     data.updateCandidates( one, initv );
@@ -1104 +1104 @@
     for(i = pVariables; i > 0; i--) varpermutation[pVariables+1-i] = (*iv)[i-1];
     delete iv;
-     
+
     for (i= 1; i <= pVariables; i++ )
     {
@@ -1157 +1157 @@
 // for a descritption of the parameters see fglm.h
 BOOLEAN
-fglmzero( idhdl sourceRingHdl, ideal & sourceIdeal, idhdl destRingHdl, ideal & destIdeal, BOOLEAN switchBack, BOOLEAN deleteIdeal )
+fglmzero( ring sourceRing, ideal & sourceIdeal, idhdl destRingHdl, ideal & destIdeal, BOOLEAN switchBack, BOOLEAN deleteIdeal )
 {
     idhdl initialRingHdl = currRingHdl;
     BOOLEAN fglmok;
 
-    if ( currRingHdl != sourceRingHdl )
-        rSetHdl( sourceRingHdl );
+    if ( currRing != sourceRing )
+    {
+        rChangeCurrRing( sourceRing );
+        currRingHdl=NULL;
+    }
     idealFunctionals L( 100, pVariables );
     fglmok = CalculateFunctionals( sourceIdeal, L );
@@ -1169 +1172 @@
         idDelete( & sourceIdeal );
     rSetHdl( destRingHdl );
-    if ( fglmok == TRUE ) {
-        L.map( IDRING( sourceRingHdl ) );
+    if ( fglmok == TRUE )
+    {
+        L.map( sourceRing );
         destIdeal= GroebnerViaFunctionals( L );
     }

kernel/misc.cc

@@ -57 +57 @@
 omBin sip_smap_bin = omGetSpecBin(sizeof(sip_smap));
 omBin sip_sring_bin = omGetSpecBin(sizeof(sip_sring));
-omBin ip_sideal_bin = omGetSpecBin(sizeof(ip_sideal));
-omBin ip_sring_bin = omGetSpecBin(sizeof(ip_sring));
 
 /*0 implementation*/

kernel/ring.cc

@@ -558 +558 @@
   }
 #endif
-  omFreeBin(r, ip_sring_bin);
+  omFreeBin(r, sip_sring_bin);
 }
 
@@ -1311 +1311 @@
     }
   }
-  sum=(ring)omAllocBin(ip_sring_bin);
+  sum=(ring)omAllocBin(sip_sring_bin);
   memcpy(sum,&tmpR,sizeof(ip_sring));
   rComplete(sum);
@@ -1538 +1538 @@
   if (r == NULL) return NULL;
   int i,j;
-  ring res=(ring)omAllocBin(ip_sring_bin);
+  ring res=(ring)omAllocBin(sip_sring_bin);
   memset(res,0,sizeof(ip_sring));
   //memcpy4(res,r,sizeof(ip_sring));
@@ -2842 +2842 @@
     return r;
   }
-  ring res=(ring)omAlloc0Bin(ip_sring_bin);
+  ring res=(ring)omAlloc0Bin(sip_sring_bin);
   *res = *r;
 
@@ -2945 +2945 @@
 ring rModifyRing_Wp(ring r, int* weights)
 {
-  ring res=(ring)omAlloc0Bin(ip_sring_bin);
+  ring res=(ring)omAlloc0Bin(sip_sring_bin);
   *res = *r;
 #ifdef HAVE_PLURAL
@@ -3019 +3019 @@
       order[1]=ringorder_C;
     }
-    ring res=(ring)omAlloc0Bin(ip_sring_bin);
+    ring res=(ring)omAlloc0Bin(sip_sring_bin);
     *res = *r;
 #ifdef HAVE_PLURAL
@@ -3072 +3072 @@
   omFree(r->block1);
   omFree(r->wvhdl);
-  omFreeBin(r,ip_sring_bin);
+  omFreeBin(r,sip_sring_bin);
 }
 
@@ -3083 +3083 @@
   omFree(r->wvhdl[0]);
   omFree(r->wvhdl);
-  omFreeBin(r,ip_sring_bin);
+  omFreeBin(r,sip_sring_bin);
 }
 

kernel/structs.h

@@ -899 +899 @@
 extern struct omBin_s* sip_smap_bin;
 extern struct omBin_s* sip_sring_bin;
-extern struct omBin_s* ip_sideal_bin;
-extern struct omBin_s* ip_sring_bin;
 extern struct omBin_s* sleftv_bin;
 
@@ -936 +934 @@
   int        id_i;
 
-#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)
-
   idrec() { memset(this,0,sizeof(*this)); }
   idhdl get(const char * s, int lev);

kernel/walkProc.cc

@@ -54 +54 @@
 
 WalkState
-walkConsistency( idhdl sringHdl, idhdl dringHdl, int * vperm )
+walkConsistency( ring sring, ring dring, int * vperm )
 {
     int k;
     WalkState state= WalkOk;
-    ring dring = IDRING( dringHdl );
-    ring sring = IDRING( sringHdl );
 
     if ( rChar(sring) != rChar(dring) )
@@ -212 +210 @@
 
 WalkState
-fractalWalkConsistency( idhdl sringHdl, idhdl dringHdl, int * vperm )
+fractalWalkConsistency( ring sring, ring dring, int * vperm )
 {
     int k;
     WalkState state= WalkOk;
-    ring dring = IDRING( dringHdl );
-    ring sring = IDRING( sringHdl );
 
     if ( rChar(sring) != rChar(dring) )

kernel/walkProc.h

@@ -4 +4 @@
 ideal walkProc(leftv first, leftv second);
 ideal fractalWalkProc(leftv first, leftv second);
-WalkState walkConsistency( idhdl sringHdl, idhdl dringHdl, int * vperm );
-WalkState fractalWalkConsistency( idhdl sringHdl, idhdl dringHdl, int * vperm );
+WalkState walkConsistency( ring sring, ring dring, int * vperm );
+WalkState fractalWalkConsistency( ring sring, ring dring, int * vperm );
 #endif
 

kernel/walkSupport.cc

@@ -1025 +1025 @@
   if (r == NULL) return NULL;
   int i,j;
-  ring res=(ring)omAllocBin(ip_sring_bin);
+  ring res=(ring)omAllocBin(sip_sring_bin);
 
   memcpy4(res,r,sizeof(ip_sring));