Changeset b50590 in git

Timestamp:

Aug 3, 2011, 2:54:34 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

f5a3a23a65b47ad6cd71830252c8a914980e436f

Parents:

0a175571d14442df414738e8fca26cdc4adb8dc6

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-03 14:54:34+02:00

git-committer:

Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:01:23+01:00

Message:

FIX: pFDeg -> p_FDeg

File:

• kernel/syz.cc (modified) (11 diffs)

kernel/syz.cc

@@ -52 +52 @@
     if (arg->m[i-maxxx]!=NULL)
     {
-      (*w1)[i] = pFDeg(arg->m[i-maxxx],currRing);
+      (*w1)[i] = p_FDeg(arg->m[i-maxxx],currRing);
       if (pGetComp(arg->m[i-maxxx])!=0)
       {
@@ -120 +120 @@
 * in the module below--*/
   searchUnit = TRUE;
-  int curr_syz_limit = rGetCurrSyzLimit();
+  int curr_syz_limit = rGetCurrSyzLimit(currRing);
   while (searchUnit)
   {
@@ -478 +478 @@
     if (j<IDELEMS(res[0]))
     {
-      if (pFDeg(res[0]->m[j],currRing)!=pTotaldegree(res[0]->m[j]))
+      if (p_FDeg(res[0]->m[j],currRing)!=pTotaldegree(res[0]->m[j]))
         setRegularity = FALSE;
     }
@@ -556 +556 @@
 //PrintLn();
       int max_comp = id_RankFreeModule(res[syzIndex],currRing);
-      k = max_comp - rGetCurrSyzLimit();
+      k = max_comp - rGetCurrSyzLimit(currRing);
       assume(w != NULL);
       if (w != NULL)
@@ -567 +567 @@
         if (res[syzIndex-1]->m[i]!=NULL) // hs
         {
-          (*w)[i + rGetCurrSyzLimit()] = pFDeg(res[syzIndex-1]->m[i],currRing);
+          (*w)[i + rGetCurrSyzLimit(currRing)] = p_FDeg(res[syzIndex-1]->m[i],currRing);
           if (pGetComp(res[syzIndex-1]->m[i])>0)
-            (*w)[i + rGetCurrSyzLimit()]
+            (*w)[i + rGetCurrSyzLimit(currRing)]
               += (*w)[pGetComp(res[syzIndex-1]->m[i])-1];
-          (*((*weights)[syzIndex]))[i] = (*w)[i+rGetCurrSyzLimit()];
+          (*((*weights)[syzIndex]))[i] = (*w)[i+rGetCurrSyzLimit(currRing)];
         }
       }
@@ -577 +577 @@
       {
         if (res[syzIndex]->m[i-k]!=NULL)
-          (*w)[i+rGetCurrSyzLimit()] = pFDeg(res[syzIndex]->m[i-k],currRing)
+          (*w)[i+rGetCurrSyzLimit(currRing)] = p_FDeg(res[syzIndex]->m[i-k],currRing)
                     +(*w)[pGetComp(res[syzIndex]->m[i-k])-1];
       }
@@ -746 +746 @@
     if (homog)
     {
-      if (index==0) k = pFDeg(temp->m[j],currRing)+degrees[pGetComp(temp->m[j])];
+      if (index==0) k = p_FDeg(temp->m[j],currRing)+degrees[pGetComp(temp->m[j])];
       else          k = degrees[pGetComp(temp->m[j])];
       if (k>=index) tocancel[k-index]++;
@@ -872 +872 @@
           return NULL;
         }
-        temp2[j+1] = pFDeg(res[i]->m[j],currRing)+temp1[pGetComp(res[i]->m[j])];
+        temp2[j+1] = p_FDeg(res[i]->m[j],currRing)+temp1[pGetComp(res[i]->m[j])];
         if (temp2[j+1]-i>rows) rows = temp2[j+1]-i;
         if (temp2[j+1]-i<mr) mr = temp2[j+1]-i;
@@ -935 +935 @@
       if (res[i]->m[j]!=NULL)
       {
-        temp2[j+1] = pFDeg(res[i]->m[j],currRing)+temp1[pGetComp(res[i]->m[j])];
+        temp2[j+1] = p_FDeg(res[i]->m[j],currRing)+temp1[pGetComp(res[i]->m[j])];
         //(*result)[i+1+(temp2[j+1]-i-1)*cols]++;
         //if (temp2[j+1]>i) IMATELEM((*result),temp2[j+1]-i-mr,i+2)++;
@@ -1082 +1082 @@
       if (res[i]->m[j]!=NULL)
       {
-        k = pFDeg(res[i]->m[j],currRing)+(*(weights[i]))[pGetComp(res[i]->m[j])]-i-1;
+        k = p_FDeg(res[i]->m[j],currRing)+(*(weights[i]))[pGetComp(res[i]->m[j])]-i-1;
         if (k>rsmax) rsmax = k;
         if (k<rsmin) rsmin = k;
@@ -1121 +1121 @@
       if (res[i]->m[j]!=NULL)
       {
-        k = pFDeg(res[i]->m[j],currRing)+(*(weights[i]))[pGetComp(res[i]->m[j])]-i;
+        k = p_FDeg(res[i]->m[j],currRing)+(*(weights[i]))[pGetComp(res[i]->m[j])]-i;
         IMATELEM(*result,k-rsmin,i+2)++;
       }