Changeset f218a7 in git

Timestamp:

Aug 3, 2011, 7:32:22 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

af66d65781bd30dd0d990cc7476eb7c230b6104f

Parents:

1b420fdcd150b1055040f75e2230c9118a3a529d

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-03 19:32:22+02:00

git-committer:

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

Message:

FIX: p[LF]Deg -> p_[LF]Deg

Location:

kernel

Files:

• syz0.cc (modified) (2 diffs)
• syz2.cc (modified) (1 diff)
• syz3.cc (modified) (18 diffs)

kernel/syz0.cc

@@ -215 +215 @@
   {
     S[j] = pCopy(F[j]);
-    totalS[j] = pLDeg(S[j],&k,currRing);
-    ecartS[j] = totalS[j]-pFDeg(S[j],currRing);
+    totalS[j] = p_LDeg(S[j],&k,currRing);
+    ecartS[j] = totalS[j]-p_FDeg(S[j],currRing);
 //Print("%d", pGetComp(S[j]));PrintS("  ");
     p = S[j];
@@ -325 +325 @@
 *         {
 */
-            totalToRed = pLDeg(toRed,&kk,currRing);
-            ecartToRed = totalToRed-pFDeg(toRed,currRing);
+            totalToRed = p_LDeg(toRed,&kk,currRing);
+            ecartToRed = totalToRed-p_FDeg(toRed,currRing);
 /*
 *         }

kernel/syz2.cc

@@ -934 +934 @@
       for (j=0;j<k;j++)
       {
-        if (toreor->m[j]!=NULL) (IMATELEM(*syzstr->betti,pFDeg(toreor->m[j],currRing)-i+1,i+1))++;
+        if (toreor->m[j]!=NULL) (IMATELEM(*syzstr->betti,p_FDeg(toreor->m[j],currRing)-i+1,i+1))++;
         reor->m[j] = toreor->m[j];
         toreor->m[j] = NULL;

kernel/syz3.cc

@@ -272 +272 @@
       if ((syzstr->regularity>0) && (res[syzIndex]->m[i]!=NULL))
       {
-        if (pFDeg(res[syzIndex]->m[i],currRing)>=syzstr->regularity+syzIndex)
+        if (p_FDeg(res[syzIndex]->m[i],currRing)>=syzstr->regularity+syzIndex)
           pDelete(&res[syzIndex]->m[i]);
       }
@@ -334 +334 @@
       IDELEMS(old_repr) += 16;
     }
-    k = pFDeg(new_generators->m[i],currRing);
+    k = p_FDeg(new_generators->m[i],currRing);
     kk = pGetComp(new_generators->m[i]);
     j = og_ini;
@@ -340 +340 @@
            (pGetComp(old_generators->m[j])<kk)) j++;
     while ((j<og_elem) && (old_generators->m[j]!=NULL) &&
-           (pFDeg(old_generators->m[j],currRing)<=k)) j++;
+           (p_FDeg(old_generators->m[j],currRing)<=k)) j++;
     for (jj=og_elem;jj>j;jj--)
     {
@@ -439 +439 @@
         tso.lcm = prs[jj];
         prs[jj] = NULL;
-        tso.order = pFDeg(tso.lcm,currRing);
+        tso.order = p_FDeg(tso.lcm,currRing);
         tso.p1 = old_generators->m[jj];
         tso.p2 = old_generators->m[j];
@@ -678 +678 @@
     {
 /*--- tests wether a generator must be replaced (lt(f1)|lt(f2)!)--*/
-      if (pFDeg(tso.p1,currRing)==pFDeg(tso.lcm,currRing))
+      if (p_FDeg(tso.p1,currRing)==p_FDeg(tso.lcm,currRing))
         toReplace = tso.ind1+1;
-      else if (pFDeg(tso.p2,currRing)==pFDeg(tso.lcm,currRing))
+      else if (p_FDeg(tso.p2,currRing)==p_FDeg(tso.lcm,currRing))
         toReplace = tso.ind2+1;
     }
@@ -686 +686 @@
 /*--- tests wether the product criterion applies --------------*/
     if ((index==0) && (old_generators->rank==1) && 
-        (pFDeg(tso.p1,currRing)+pFDeg(tso.p2,currRing)==tso.order))
+        (p_FDeg(tso.p1,currRing)+p_FDeg(tso.p2,currRing)==tso.order))
     {
       tso.p = NULL;
@@ -1138 +1138 @@
         tso.lcm = prs[j];
         prs[j] = NULL;
-        tso.order = pFDeg(tso.lcm,currRing);
+        tso.order = p_FDeg(tso.lcm,currRing);
         tso.p1 = add_generators->m[j];
         tso.p2 = add_generators->m[i];
@@ -1197 +1197 @@
       PrintS(".");
 #ifdef USE_PROD_CRIT
-    if (pFDeg(tso.p1,currRing)+pFDeg(tso.p2,currRing)==tso.order+pFDeg(deg_soc,currRing))
+    if (p_FDeg(tso.p1,currRing)+p_FDeg(tso.p2,currRing)==tso.order+p_FDeg(deg_soc,currRing))
     {
       if (TEST_OPT_PROT) PrintS("pc");
@@ -1422 +1422 @@
   while ((next_place_add>0) && (add_generators->m[next_place_add-1]==NULL))
     next_place_add--;
-  int next_deg = pFDeg(temp_generators->m[i],currRing);
+  int next_deg = p_FDeg(temp_generators->m[i],currRing);
   next_new_el = next_place_add;
 /*--- loop about all all elements-----------------------------------*/
@@ -1442 +1442 @@
     }
 #endif
-    while ((i<idel_temp) && (pFDeg(temp_generators->m[i],currRing)==next_deg))
+    while ((i<idel_temp) && (p_FDeg(temp_generators->m[i],currRing)==next_deg))
     {
       next_p = temp_generators->m[i];
@@ -1503 +1503 @@
     red_deg = next_deg;
     if (i<idel_temp)
-      next_deg = pFDeg(temp_generators->m[i],currRing);
+      next_deg = p_FDeg(temp_generators->m[i],currRing);
     else
       next_deg = -1;
@@ -1607 +1607 @@
       p = new_generators->m[j];
       new_generators->m[j] = NULL;
-      deg_p = pFDeg(p,currRing);
+      deg_p = p_FDeg(p,currRing);
       if (min_deg<0)
       {
@@ -1618 +1618 @@
       k = 0;
       while ((k<idel_temp) && (temp_generators->m[k]!=NULL) &&
-             (pFDeg(temp_generators->m[k],currRing)<=deg_p)) k++;
+             (p_FDeg(temp_generators->m[k],currRing)<=deg_p)) k++;
       for (jj=idel_temp-1;jj>k;jj--)
       {
@@ -1787 +1787 @@
   {
     int md;
-    int maxdeg=pFDeg(temp->m[IDELEMS(temp)-1],currRing);
+    int maxdeg=p_FDeg(temp->m[IDELEMS(temp)-1],currRing);
     ideal temp1=idInit(IDELEMS(temp),temp->rank);
     for (j=IDELEMS(temp)-2;j>=0;j--)
     {
-      jj = pFDeg(temp->m[j],currRing);
+      jj = p_FDeg(temp->m[j],currRing);
       if (jj>maxdeg) maxdeg = jj;
     }
@@ -1801 +1801 @@
         if (temp->m[j]!=NULL)
         {
-          jj = pFDeg(temp->m[j],currRing);
+          jj = p_FDeg(temp->m[j],currRing);
           if (jj<md) md = jj;
         }
@@ -1807 +1807 @@
       for (j=0;j<IDELEMS(temp);j++)
       {
-        if ((temp->m[j]!=NULL) && (pFDeg(temp->m[j],currRing)==md))
+        if ((temp->m[j]!=NULL) && (p_FDeg(temp->m[j],currRing)==md))
         {
           temp1->m[k] = temp->m[j];
@@ -1845 +1845 @@
       if (!nIsOne(pGetCoeff(new_generators->m[0])))
         pNorm(new_generators->m[0]);
-      next_deg = pFDeg(new_generators->m[0],currRing);
+      next_deg = p_FDeg(new_generators->m[0],currRing);
       next_gen = pCopy(new_generators->m[0]);
     }
@@ -1991 +1991 @@
             PrintS("Da ist was faul!!!\n");
             Print("Aber: Regularitaet %d, Grad %ld\n",
-                   syzstr->regularity,pFDeg(totake[index]->m[i],currRing));
+                   syzstr->regularity,p_FDeg(totake[index]->m[i],currRing));
           }
         }