Changeset 31f1850 in git

Timestamp:

Jan 10, 2012, 4:20:10 PM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

930ea815182bc9bf3182f1c57876006af26295b2

Parents:

a74143eec598021f060c389b66230f8f035cc1c5

Message:

chg: pDeg leads to confusion, removed to p_Deg

Files:

• Singular/janet.cc (modified) (2 diffs)
• Singular/wrapper.cc (modified) (1 diff)
• kernel/fast_maps.cc (modified) (3 diffs)
• kernel/ideals.cc (modified) (4 diffs)
• kernel/kutil.cc (modified) (5 diffs)
• kernel/linearAlgebra.cc (modified) (1 diff)
• kernel/polys.h (modified) (1 diff)

Singular/janet.cc

@@ -44 +44 @@
 
 //#define pow_(x) pTotaldegree((x))
-//#define pow_(x) pDeg((x))
+//#define pow_(x) p_Deg((x,currRing))
 pFDegProc jDeg;
 #define pow_(x) jDeg((x),currRing)
@@ -957 +957 @@
   {
     degree_compatible=1;
-    jDeg=pDeg;
+    jDeg=p_Deg;
     ListGreatMove=ListGreatMoveDegree;
   }

Singular/wrapper.cc

@@ -89 +89 @@
       {
         //if (pTotaldegree(iT->info->lead) == pTotaldegree(iT->info->history))
-        if (pDeg(iT->info->lead) == pDeg(iT->info->history))
+        if (p_Deg(iT->info->lead,currRing) == p_Deg(iT->info->history,currRing))
         {
           result->m[ideal_length-ideal_index-1]=pCopy(iT->info->root);

kernel/fast_maps.cc

@@ -638 +638 @@
   poly fq_p=NULL;
   choice=NULL;
-  while ((iter != NULL) && (pDeg(iter->src, r) > ggt_deg))
+  while ((iter != NULL) && (p_Deg(iter->src, r) > ggt_deg))
   {
     //    maMonomial_Out(iter, r, NULL);
@@ -648 +648 @@
       int tmp_deg;
       assume((q1!=NULL)&&(q2!=NULL));
-      if ((tmp_deg=pDeg(q,r)) > ggt_deg)
+      if ((tmp_deg=p_Deg(q,r)) > ggt_deg)
       {
         choice=iter;
@@ -657 +657 @@
           p_LmFree(fq_p, r);
         }
-        ggt_deg = tmp_deg ; /*pDeg(q, r);*/
+        ggt_deg = tmp_deg ; /*p_Deg(q, r);*/
         ggT = q;
         fp_p = q1;

kernel/ideals.cc

@@ -1224 +1224 @@
   for(i=IDELEMS(Q)-1;i>=0;i--)
     if(w==NULL)
-      N=si_max(N,pDeg(Q->m[i]));
+      N=si_max(N,p_Deg(Q->m[i],currRing));
     else
       N=si_max(N,pDegW(Q->m[i],w));
@@ -1251 +1251 @@
           p=pJetW(pSub(p,ppMult_mm(Q->m[j],p0)),N,w);
         pNormalize(p);
-        if((w==NULL)&&(pDeg(p0)>n)||(w!=NULL)&&(pDegW(p0,w)>n))
+        if((w==NULL)&&(p_Deg(p0,currRing)>n)||(w!=NULL)&&(pDegW(p0,w)>n))
           p_Delete(&p0,currRing);
         else
@@ -1264 +1264 @@
           pIter(p);
           pNext(p0)=NULL;
-          if(((w==NULL)&&(pDeg(p0)>n))
+          if(((w==NULL)&&(p_Deg(p0,currRing)>n))
           ||((w!=NULL)&&(pDegW(p0,w)>n)))
             p_Delete(&p0,currRing);
@@ -2133 +2133 @@
       if (p!=NULL)
       {
-        d = pDeg(p);
+        d = p_Deg(p,currRing);
         k= pGetComp(p);
         if (slength>0) k--;

kernel/kutil.cc

@@ -3238 +3238 @@
   )
   {
-    int o=pDeg(p);
-    int oo=pDeg(set[length]);
+    int o=p_Deg(p,currRing);
+    int oo=p_Deg(set[length],currRing);
 
     if ((oo<o)
@@ -3249 +3249 @@
       if (an >= en-1)
       {
-        if ((pDeg(set[an])>=o) && (pLmCmp(set[an],p) == cmp_int))
+        if ((p_Deg(set[an],currRing)>=o) && (pLmCmp(set[an],p) == cmp_int))
         {
           return an;
@@ -3256 +3256 @@
       }
       i=(an+en) / 2;
-      if ((pDeg(set[i])>=o) && (pLmCmp(set[i],p) == cmp_int)) en=i;
+      if ((p_Deg(set[i],currRing)>=o) && (pLmCmp(set[i],p) == cmp_int)) en=i;
       else                              an=i;
     }
@@ -6342 +6342 @@
   strat->overflow=FALSE;
   ring new_tailRing = rModifyRing(currRing,
-                                  // Hmmm .. the condition pFDeg == pDeg
+                                  // Hmmm .. the condition pFDeg == p_Deg
                                   // might be too strong
 #ifdef HAVE_RINGS
-                                  (strat->homog && currRing->pFDeg == pDeg && !(rField_is_Ring(currRing))), // TODO Oliver
+                                  (strat->homog && currRing->pFDeg == p_Deg && !(rField_is_Ring(currRing))), // TODO Oliver
 #else
-                                  (strat->homog && pFDeg == pDeg), // omit_degree
+                                  (strat->homog && currRing->pFDeg == p_Deg), // omit_degree
 #endif
                                   (strat->ak==0), // omit_comp if the input is an ideal
@@ -6752 +6752 @@
     else if (strat->tailRing->pLDeg==maxdegreeWecart) PrintS("maxdegreeWecart");
     else Print("? (%lx)", (long)strat->tailRing->pLDeg);
-    Print(" syzring:%d, syzComp(strat):%d syzComb:%d limit:%ld\n",rIsSyzIndexRing(currRing),strat->syzComp,rGetCurrSyzLimit(currRing));
+    PrintLn();
+  PrintS("currRing->pFDeg: ");
+    if (currRing->pFDeg==p_Totaldegree) PrintS("p_Totaldegree");
+    else if (currRing->pFDeg==p_WFirstTotalDegree) PrintS("pWFirstTotalDegree");
+    else if (currRing->pFDeg==p_Deg) PrintS("p_Deg");
+    else if (currRing->pFDeg==kHomModDeg) PrintS("kHomModDeg");
+    else if (currRing->pFDeg==totaldegreeWecart) PrintS("totaldegreeWecart");
+    else Print("? (%lx)", (long)currRing->pFDeg);
+    PrintLn();
+    Print(" syzring:%d, syzComp(strat):%d limit:%d\n",rIsSyzIndexRing(currRing),strat->syzComp,rGetCurrSyzLimit(currRing));
     if(TEST_OPT_DEGBOUND)
       Print(" degBound: %d\n", Kstd1_deg);

kernel/linearAlgebra.cc

@@ -1212 +1212 @@
                    const poly f0, const poly g0, const int d, poly &f, poly &g)
 {
-  int n = (int)pDeg(f0);
-  int m = (int)pDeg(g0);
+  int n = (int)p_Deg(f0,currRing);
+  int m = (int)p_Deg(g0,currRing);
   matrix aMat = mpNew(n + m, n + m);     /* matrix A for linear system */
   matrix pMat; matrix lMat; matrix uMat; /* for the decomposition of A */

kernel/polys.h

@@ -247 +247 @@
  ***************************************************************/
 inline int pWeight(int i, const ring R = currRing){ return p_Weight(i, R); }
-inline long pDeg(poly p, const ring R = currRing) { return p_Deg(p, R); }