Changeset a41623 in git for kernel/shiftgb.cc


Ignore:
Timestamp:
May 27, 2011, 3:52:46 PM (12 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')
Children:
410ea0fb1e22ebcb52e33b6789cf294a2d1f663b
Parents:
6e80ab1defd5ab31610bce94c4f375be2fec8d0e
Message:
removed dead code, unused variables etc

git-svn-id: file:///usr/local/Singular/svn/trunk@14249 2c84dea3-7e68-4137-9b89-c4e89433aadc
File:
1 edited

Legend:

Unmodified
Added
Removed
  • kernel/shiftgb.cc

    r6e80ab ra41623  
    6060  poly s   = p_mLPshift(p, sh, uptodeg, lV, r); // lm in currRing
    6161  poly pp = pNext(p);
    62  
     62
    6363  while (pp != NULL)
    6464  {
     
    119119
    120120  int j;
    121   //  for (j=1; j<=r->N; j++) 
     121  //  for (j=1; j<=r->N; j++)
    122122  // L*lV gives the last position of the last block
    123123  for (j=1; j<= L*lV ; j++)
     
    131131    }
    132132#ifdef PDEBUG
    133     else 
     133    else
    134134    {
    135135      if (e[j]!=0)
    136136      {
    137         //         Print("p_mLPshift: ex[%d]=%d\n",j,e[j]);
     137         //         Print("p_mLPshift: ex[%d]=%d\n",j,e[j]);
    138138      }
    139139    }
     
    149149  //  p_SetCoeff0(m,p_GetCoeff(p,r),r);
    150150  p_SetComp(m,p_GetComp(p,r),r); // component is preserved
    151   p_SetCoeff0(m,p_GetCoeff(p,r),r);  // coeff is preserved 
     151  p_SetCoeff0(m,p_GetCoeff(p,r),r);  // coeff is preserved
    152152  return(m);
    153153}
     
    226226  /* the 0th block is the 1st one */
    227227  poly q = p; //p_Copy(p,currRing); /* need it ? */
    228   int ans = 0; 
     228  int ans = 0;
    229229  int ansnew = 0;
    230230  while (q!=NULL)
     
    251251  j = currRing->N;
    252252  while ( (!e[j]) && (j>=1) ) j--;
    253   if (j==0) 
     253  if (j==0)
    254254  {
    255255#ifdef PDEBUG
    256256    PrintS("pmLastVblock: unexpected zero exponent vector\n");
    257 #endif   
     257#endif
    258258    return(j);
    259259  }
     
    273273
    274274  int ans = p_mLastVblock(p, lV, r); // Block of LM
    275   poly q = pNext(p); 
     275  poly q = pNext(p);
    276276  int ansnew = 0;
    277277  while (q != NULL)
     
    291291  /* the 0th block is the 1st one */
    292292  poly q = p; //p_Copy(p,currRing); /* need it ? */
    293   int ans = 0; 
     293  int ans = 0;
    294294  int ansnew = 0;
    295295  while (q!=NULL)
     
    316316  j = r->N;
    317317  while ( (!e[j]) && (j>=1) ) j--;
    318   if (j==0) 
     318  if (j==0)
    319319  {
    320320#ifdef PDEBUG
    321321    PrintS("pmLastVblock: unexpected zero exponent vector\n");
    322 #endif   
     322#endif
    323323    return(j);
    324324  }
     
    334334  /* the 0th block is the 1st one */
    335335  poly q = p; //p_Copy(p,currRing); /* need it ? */
    336   int ans = 0; 
     336  int ans = 0;
    337337  int ansnew = 0;
    338338  while (q!=NULL)
     
    359359  j = 1;
    360360  while ( (!e[j]) && (j<=currRing->N-1) ) j++;
    361   if (j==currRing->N + 1) 
     361  if (j==currRing->N + 1)
    362362  {
    363363#ifdef PDEBUG
    364364    PrintS("pmFirstVblock: unexpected zero exponent vector\n");
    365 #endif   
     365#endif
    366366    return(j);
    367367  }
     
    384384  int *e = (int *)omAlloc0((currRing->N+1)*sizeof(int));
    385385  int  b = (int)((currRing->N +lV-1)/lV); /* the number of blocks */
    386   //int b  = (int)(currRing->N)/lV; 
     386  //int b  = (int)(currRing->N)/lV;
    387387  int *B = (int *)omAlloc0((b+1)*sizeof(int)); /* the num of elements in a block */
    388388  pGetExpV(p,e);
     
    413413//   }
    414414  /* now B[j] != 0 and we test place-squarefreeness */
    415   for (j; j>=1; j--)
     415  for (; j>=1; j--)
    416416  {
    417417    if (B[j]!=1)
     
    472472    i = si_max(i, p_LastVblock(pNext(p), lV, r) );
    473473  }
    474   //  i = uptodeg  - i +1; 
    475   i = uptodeg  - i; 
     474  //  i = uptodeg  - i +1;
     475  i = uptodeg  - i;
    476476  //  p_wrp(p,currRing,r); Print("----i:%d",i); PrintLn();
    477477  return(i);
     
    495495  poly s   = p_mShrink(p, lV, r); // lm in currRing
    496496  poly pp = pNext(p);
    497  
     497
    498498  while (pp != NULL)
    499499  {
     
    517517  poly q = NULL;
    518518  poly pp = p;
    519  
     519
    520520  while (pp != NULL)
    521521  {
     
    546546    for (i=(j-1)*lV + 1; i<= j*lV; i++)
    547547    {
    548       if (e[i]==1) 
     548      if (e[i]==1)
    549549      {
    550         //      B[j] = B[j]+1; // for control in V?
     550         //      B[j] = B[j]+1; // for control in V?
    551551         S[(cnt-1)*lV + (i - (j-1)*lV)] = e[i];
    552552         /* assuming we are in V, can interrupt here */
     
    568568  /*  p_Setm(s,r); // done by p_SetExpV */
    569569  p_SetComp(s,p_GetComp(p,r),r); // component is preserved
    570   p_SetCoeff(s,p_GetCoeff(p,r),r);  // coeff is preserved 
     570  p_SetCoeff(s,p_GetCoeff(p,r),r);  // coeff is preserved
    571571#ifdef PDEBUG
    572572  //  Print("p_mShrink: from "); p_wrp(p,r); Print(" to "); p_wrp(s,r); PrintLn();
Note: See TracChangeset for help on using the changeset viewer.