Changeset ea0d5e in git for kernel

Timestamp:

Sep 7, 2017, 2:00:36 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

c0aff389a8820410fa9cc349ee64be071ff24c5a

Parents:

ee5131f3c455046a759fc6ff99e78dc2494a8d8e

Message:

chg: pGetExp -> p_GetExpV

Location:

kernel

Files:

• GBEngine/f5gb.cc (modified) (1 diff)
• GBEngine/kstd2.cc (modified) (2 diffs)
• GBEngine/shiftgb.cc (modified) (2 diffs)
• groebner_walk/walkSupport.cc (modified) (2 diffs)
• numeric/mpr_base.cc (modified) (3 diffs)

kernel/GBEngine/f5gb.cc

@@ -1922 +1922 @@
     int* ev = new int[r->N +1];
     for(i=0;i<IDELEMS(id);i++) {
-        pGetExpV(id->m[i],ev);
+        p_GetExpV(id->m[i],ev,currRing);
         //ev2  =   pGetExp(id->m[i],1);
         pWrite(id->m[i]);

kernel/GBEngine/kstd2.cc

@@ -3021 +3021 @@
           int cmp = pGetComp(strat->P.sig);
           int* vv = (int*)omAlloc((currRing->N+1)*sizeof(int));
-          pGetExpV (strat->P.p,vv);
-          pSetExpV (strat->P.sig, vv);
-          pSetComp (strat->P.sig,cmp);
+          p_GetExpV (strat->P.p,vv,currRing);
+          p_SetExpV (strat->P.sig, vv,currRing);
+          p_SetComp (strat->P.sig,cmp,currRing);
 
           strat->P.sevSig = pGetShortExpVector (strat->P.sig);
@@ -3072 +3072 @@
         int max_cmp = IDELEMS(F);
         int* vv = (int*)omAlloc((currRing->N+1)*sizeof(int));
-        pGetExpV (strat->P.p,vv);
+        p_GetExpV (strat->P.p,vv,currRing);
         LObject Q;
         int pos;

kernel/GBEngine/shiftgb.cc

@@ -217 +217 @@
   /* where a nonzero exponent is sitting */
   int *e=(int *)omAlloc0((currRing->N+1)*sizeof(int));
-  pGetExpV(p,e);
+  p_GetExpV(p,e,currRing);
   int j,b;
   j = 1;
@@ -248 +248 @@
   //int b  = (int)(currRing->N)/lV;
   int *B = (int *)omAlloc0((b+1)*sizeof(int)); /* the num of elements in a block */
-  pGetExpV(p,e);
+  p_GetExpV(p,e,currRing);
   int i,j;
   for (j=1; j<=b; j++)

kernel/groebner_walk/walkSupport.cc

@@ -751 +751 @@
   int N=rVar(currRing);
   int *e=(int*)omAlloc((N+1)*sizeof(int));
-  pGetExpV(p,e);
+  p_GetExpV(p,e,currRing);
   intvec* iv=new intvec(N);
   for(int i=N;i>0;i--) { (*iv)[i-1]=e[i];}
@@ -774 +774 @@
   int N=rVar(currRing);
   int *e=(int*)omAlloc((N+1)*sizeof(int));
-  pGetExpV(p,e);
+  p_GetExpV(p,e,currRing);
   int64vec* iv64=new int64vec(N);
   for(int i=N;i>0;i--) { (*iv64)[i-1]=(int64)e[i];}

kernel/numeric/mpr_base.cc

@@ -559 +559 @@
   while ( piter )
   {
-    pGetExpV( piter, vert );
+    p_GetExpV( piter, vert, currRing );
 
     for ( i= 1; i <= num; i++ )
@@ -586 +586 @@
   vert= (int *)omAlloc( (dim+1) * sizeof(int) );
 
-  pGetExpV( p, vert );
+  p_GetExpV( p, vert, currRing );
   for ( i= 1; i <= num; i++ )
   {
@@ -799 +799 @@
       if( !inHull( (gls->m)[i], p, m, j ) )
       {
-        pGetExpV( p, vert );
+        p_GetExpV( p, vert, currRing );
         Q[i]->addPoint( vert );
         k++;