Changeset f218a7 in git


Ignore:
Timestamp:
Aug 3, 2011, 7:32:22 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
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:
3 edited

Legend:

Unmodified
Added
Removed
  • kernel/syz0.cc

    r1b420fd rf218a7  
    215215  {
    216216    S[j] = pCopy(F[j]);
    217     totalS[j] = pLDeg(S[j],&k,currRing);
    218     ecartS[j] = totalS[j]-pFDeg(S[j],currRing);
     217    totalS[j] = p_LDeg(S[j],&k,currRing);
     218    ecartS[j] = totalS[j]-p_FDeg(S[j],currRing);
    219219//Print("%d", pGetComp(S[j]));PrintS("  ");
    220220    p = S[j];
     
    325325*         {
    326326*/
    327             totalToRed = pLDeg(toRed,&kk,currRing);
    328             ecartToRed = totalToRed-pFDeg(toRed,currRing);
     327            totalToRed = p_LDeg(toRed,&kk,currRing);
     328            ecartToRed = totalToRed-p_FDeg(toRed,currRing);
    329329/*
    330330*         }
  • kernel/syz2.cc

    r1b420fd rf218a7  
    934934      for (j=0;j<k;j++)
    935935      {
    936         if (toreor->m[j]!=NULL) (IMATELEM(*syzstr->betti,pFDeg(toreor->m[j],currRing)-i+1,i+1))++;
     936        if (toreor->m[j]!=NULL) (IMATELEM(*syzstr->betti,p_FDeg(toreor->m[j],currRing)-i+1,i+1))++;
    937937        reor->m[j] = toreor->m[j];
    938938        toreor->m[j] = NULL;
  • kernel/syz3.cc

    r1b420fd rf218a7  
    272272      if ((syzstr->regularity>0) && (res[syzIndex]->m[i]!=NULL))
    273273      {
    274         if (pFDeg(res[syzIndex]->m[i],currRing)>=syzstr->regularity+syzIndex)
     274        if (p_FDeg(res[syzIndex]->m[i],currRing)>=syzstr->regularity+syzIndex)
    275275          pDelete(&res[syzIndex]->m[i]);
    276276      }
     
    334334      IDELEMS(old_repr) += 16;
    335335    }
    336     k = pFDeg(new_generators->m[i],currRing);
     336    k = p_FDeg(new_generators->m[i],currRing);
    337337    kk = pGetComp(new_generators->m[i]);
    338338    j = og_ini;
     
    340340           (pGetComp(old_generators->m[j])<kk)) j++;
    341341    while ((j<og_elem) && (old_generators->m[j]!=NULL) &&
    342            (pFDeg(old_generators->m[j],currRing)<=k)) j++;
     342           (p_FDeg(old_generators->m[j],currRing)<=k)) j++;
    343343    for (jj=og_elem;jj>j;jj--)
    344344    {
     
    439439        tso.lcm = prs[jj];
    440440        prs[jj] = NULL;
    441         tso.order = pFDeg(tso.lcm,currRing);
     441        tso.order = p_FDeg(tso.lcm,currRing);
    442442        tso.p1 = old_generators->m[jj];
    443443        tso.p2 = old_generators->m[j];
     
    678678    {
    679679/*--- tests wether a generator must be replaced (lt(f1)|lt(f2)!)--*/
    680       if (pFDeg(tso.p1,currRing)==pFDeg(tso.lcm,currRing))
     680      if (p_FDeg(tso.p1,currRing)==p_FDeg(tso.lcm,currRing))
    681681        toReplace = tso.ind1+1;
    682       else if (pFDeg(tso.p2,currRing)==pFDeg(tso.lcm,currRing))
     682      else if (p_FDeg(tso.p2,currRing)==p_FDeg(tso.lcm,currRing))
    683683        toReplace = tso.ind2+1;
    684684    }
     
    686686/*--- tests wether the product criterion applies --------------*/
    687687    if ((index==0) && (old_generators->rank==1) &&
    688         (pFDeg(tso.p1,currRing)+pFDeg(tso.p2,currRing)==tso.order))
     688        (p_FDeg(tso.p1,currRing)+p_FDeg(tso.p2,currRing)==tso.order))
    689689    {
    690690      tso.p = NULL;
     
    11381138        tso.lcm = prs[j];
    11391139        prs[j] = NULL;
    1140         tso.order = pFDeg(tso.lcm,currRing);
     1140        tso.order = p_FDeg(tso.lcm,currRing);
    11411141        tso.p1 = add_generators->m[j];
    11421142        tso.p2 = add_generators->m[i];
     
    11971197      PrintS(".");
    11981198#ifdef USE_PROD_CRIT
    1199     if (pFDeg(tso.p1,currRing)+pFDeg(tso.p2,currRing)==tso.order+pFDeg(deg_soc,currRing))
     1199    if (p_FDeg(tso.p1,currRing)+p_FDeg(tso.p2,currRing)==tso.order+p_FDeg(deg_soc,currRing))
    12001200    {
    12011201      if (TEST_OPT_PROT) PrintS("pc");
     
    14221422  while ((next_place_add>0) && (add_generators->m[next_place_add-1]==NULL))
    14231423    next_place_add--;
    1424   int next_deg = pFDeg(temp_generators->m[i],currRing);
     1424  int next_deg = p_FDeg(temp_generators->m[i],currRing);
    14251425  next_new_el = next_place_add;
    14261426/*--- loop about all all elements-----------------------------------*/
     
    14421442    }
    14431443#endif
    1444     while ((i<idel_temp) && (pFDeg(temp_generators->m[i],currRing)==next_deg))
     1444    while ((i<idel_temp) && (p_FDeg(temp_generators->m[i],currRing)==next_deg))
    14451445    {
    14461446      next_p = temp_generators->m[i];
     
    15031503    red_deg = next_deg;
    15041504    if (i<idel_temp)
    1505       next_deg = pFDeg(temp_generators->m[i],currRing);
     1505      next_deg = p_FDeg(temp_generators->m[i],currRing);
    15061506    else
    15071507      next_deg = -1;
     
    16071607      p = new_generators->m[j];
    16081608      new_generators->m[j] = NULL;
    1609       deg_p = pFDeg(p,currRing);
     1609      deg_p = p_FDeg(p,currRing);
    16101610      if (min_deg<0)
    16111611      {
     
    16181618      k = 0;
    16191619      while ((k<idel_temp) && (temp_generators->m[k]!=NULL) &&
    1620              (pFDeg(temp_generators->m[k],currRing)<=deg_p)) k++;
     1620             (p_FDeg(temp_generators->m[k],currRing)<=deg_p)) k++;
    16211621      for (jj=idel_temp-1;jj>k;jj--)
    16221622      {
     
    17871787  {
    17881788    int md;
    1789     int maxdeg=pFDeg(temp->m[IDELEMS(temp)-1],currRing);
     1789    int maxdeg=p_FDeg(temp->m[IDELEMS(temp)-1],currRing);
    17901790    ideal temp1=idInit(IDELEMS(temp),temp->rank);
    17911791    for (j=IDELEMS(temp)-2;j>=0;j--)
    17921792    {
    1793       jj = pFDeg(temp->m[j],currRing);
     1793      jj = p_FDeg(temp->m[j],currRing);
    17941794      if (jj>maxdeg) maxdeg = jj;
    17951795    }
     
    18011801        if (temp->m[j]!=NULL)
    18021802        {
    1803           jj = pFDeg(temp->m[j],currRing);
     1803          jj = p_FDeg(temp->m[j],currRing);
    18041804          if (jj<md) md = jj;
    18051805        }
     
    18071807      for (j=0;j<IDELEMS(temp);j++)
    18081808      {
    1809         if ((temp->m[j]!=NULL) && (pFDeg(temp->m[j],currRing)==md))
     1809        if ((temp->m[j]!=NULL) && (p_FDeg(temp->m[j],currRing)==md))
    18101810        {
    18111811          temp1->m[k] = temp->m[j];
     
    18451845      if (!nIsOne(pGetCoeff(new_generators->m[0])))
    18461846        pNorm(new_generators->m[0]);
    1847       next_deg = pFDeg(new_generators->m[0],currRing);
     1847      next_deg = p_FDeg(new_generators->m[0],currRing);
    18481848      next_gen = pCopy(new_generators->m[0]);
    18491849    }
     
    19911991            PrintS("Da ist was faul!!!\n");
    19921992            Print("Aber: Regularitaet %d, Grad %ld\n",
    1993                    syzstr->regularity,pFDeg(totake[index]->m[i],currRing));
     1993                   syzstr->regularity,p_FDeg(totake[index]->m[i],currRing));
    19941994          }
    19951995        }
Note: See TracChangeset for help on using the changeset viewer.