Changeset 30664c in git for kernel


Ignore:
Timestamp:
Nov 22, 2012, 10:19:29 PM (11 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
6fcddc9d1ce61bb4b060ffc6ead86cd70694c9a8
Parents:
e12d106a70736a96de005699524e86b37b9e9c98
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-11-22 22:19:29+01:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-11-26 17:18:46+01:00
Message:
Warning elimination + cosmetics
Location:
kernel
Files:
4 edited

Legend:

Unmodified
Added
Removed
  • kernel/ideals.cc

    re12d106 r30664c  
    751751ideal idLiftStd (ideal  h1, matrix* ma, tHomog hi, ideal * syz)
    752752{
    753   int   i, j, k, t, inputIsIdeal=id_RankFreeModule(h1,currRing);
     753  int  i, j, t, inputIsIdeal=id_RankFreeModule(h1,currRing);
     754  long k;
    754755  poly  p=NULL, q;
    755756  intvec *w=NULL;
     
    778779  SI_SAVE_OPT2(save2);
    779780
    780   k=si_max(1,(int)id_RankFreeModule(h1,currRing));
     781  k=si_max((long)1,id_RankFreeModule(h1,currRing));
    781782
    782783  if ((k==1) && (!lift3)) si_opt_2 |=Sy_bit(V_IDLIFT);
  • kernel/kstd1.cc

    re12d106 r30664c  
    21562156    w = &temp_w;
    21572157  }
    2158   if ((h==testHomog)
    2159   )
     2158  if (h==testHomog)
    21602159  {
    21612160    if (strat->ak == 0)
  • kernel/kstdfac.cc

    re12d106 r30664c  
    905905  strat->LazyDegree = 1;
    906906  strat->ak = id_RankFreeModule(F,currRing);
    907   if ((h==testHomog))
     907  if (h==testHomog)
    908908  {
    909909    if (strat->ak==0)
  • kernel/kutil.cc

    re12d106 r30664c  
    59635963    strat->syzl       = strat->syzmax = ps;
    59645964    strat->syzidxmax  = comp;
    5965 #ifdef DEBUGF5 || DEBUGF51
     5965#if defined(DEBUGF5) || defined(DEBUGF51)
    59665966    printf("------------- GENERATING SYZ RULES NEW ---------------\n");
    59675967#endif
     
    81048104      return r;
    81058105    }
    8106       ring res = rCopy0(r, FALSE, TRUE);
    8107       for (int i=1; i<n-1; i++)
    8108       {
    8109         res->order[i] = res->order[i-1];
    8110         res->block0[i] = res->block0[i-1];
    8111         res->block1[i] = res->block1[i-1];
    8112         res->wvhdl[i] = res->wvhdl[i-1];
    8113       }
     8106    ring res = rCopy0(r, FALSE, TRUE);
     8107    for (int i=1; i<n-1; i++)
     8108    {
     8109      res->order[i] = res->order[i-1];
     8110      res->block0[i] = res->block0[i-1];
     8111      res->block1[i] = res->block1[i-1];
     8112      res->wvhdl[i] = res->wvhdl[i-1];
     8113    }
    81148114
    81158115    // new 1st block
     
    81378137    }
    81388138#endif
    8139   strat->tailRing = res;
    8140   return (res);
    8141   }
     8139    strat->tailRing = res;
     8140    return (res);
     8141  }
     8142 
    81428143  // not incremental => use Schreyer order
    81438144  // this is done by a trick when initializing the signatures
     
    81488149  // => we do not need to change the underlying polynomial ring at all!
    81498150
     8151  // UPDATE/NOTE/TODO: use induced Schreyer ordering 'IS'!!!!????
    81508152
    81518153  /*
     
    82448246  }
    82458247  */
     8248 
     8249  assume(FALSE);
     8250  return(NULL);
    82468251}
    82478252
Note: See TracChangeset for help on using the changeset viewer.