Changeset 7e53d9 in git


Ignore:
Timestamp:
Aug 3, 2011, 7:10:47 PM (13 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b52fc4b2495505785981d640dcf7eb3e456778ef')
Children:
36dd348c07984f48c3bf7582c5f05be7aa4ea52e
Parents:
47f9851c41b863a6cb62e84a4752eb913c8158ca
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2011-08-03 19:10:47+02:00
git-committer:
Mohamed Barakat <mohamed.barakat@rwth-aachen.de>2011-11-09 13:14:21+01:00
Message:
FIX: rCurrRingAssure_* -> rAssure_* + rChangeCurrRing
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • kernel/ideals.cc

    r47f985 r7e53d9  
    744744  )
    745745  {
    746     ring dp_C_ring = rAssure_dp_C(syz_ring); // will do rChangeCurrRing later
     746    ring dp_C_ring = rAssure_dp_C(syz_ring, TRUE); // will do rChangeCurrRing later
    747747    if (dp_C_ring != syz_ring)
    748748    {
  • kernel/syz.cc

    r47f985 r7e53d9  
    419419/*--- initialize the syzygy-ring -----------------------------*/
    420420  ring origR = currRing;
    421   ring syz_ring = rCurrRingAssure_SyzComp();
     421  ring syz_ring = rAssure_SyzComp(origR, TRUE); // will do rChangeCurrRing if needed
    422422  rSetSyzComp(rk_arg, syz_ring);
    423423
  • kernel/syz0.cc

    r47f985 r7e53d9  
    912912      if ((hom==isHomog)|| (rHasGlobalOrdering(origR)))
    913913      {
    914         syRing = rCurrRingAssure_CompLastBlock();
     914        syRing = rAssure_CompLastBlock(origR, TRUE);
    915915        if (syRing != origR)
    916916        {
     917          rChangeCurrRing(syRing);
    917918          for (i=0; i<IDELEMS(res[1]); i++)
    918919          {
     
    924925      else
    925926      {
    926         syRing = rCurrRingAssure_SyzComp_CompLastBlock();
     927        syRing = rAssure_SyzComp_CompLastBlock(origR, TRUE);
    927928        if (syRing != origR)
    928929        {
     930          rChangeCurrRing(syRing);
    929931          for (i=0; i<IDELEMS(res[0]); i++)
    930932          {
  • kernel/syz1.cc

    r47f985 r7e53d9  
    24672467
    24682468  // Creare dp,S ring and change to it
    2469   syzstr->syRing = rCurrRingAssure_dp_S();
    2470   assume(syzstr->syRing != origR);
    2471 
     2469  syzstr->syRing = rAssure_dp_S(origR, TRUE);
     2470  assume(syzstr->syRing != origR); // why?
     2471  rChangeCurrRing(syzstr->syRing);
     2472   
    24722473  // set initial ShiftedComps
    24732474  currcomponents = (int*)omAlloc0((arg->rank+1)*sizeof(int));
     
    26072608
    26082609  // Creare dp,S ring and change to it
    2609   syzstr->syRing = rCurrRingAssure_dp_S();
     2610  syzstr->syRing = rAssure_dp_S(origR, TRUE);
    26102611  assume(syzstr->syRing != origR);
    26112612  assume(syzstr->syRing->typ[1].ord_typ == ro_syzcomp);
    2612 
     2613  rChangeCurrRing(syzstr->syRing);
    26132614
    26142615  // set initial ShiftedComps
  • kernel/syz2.cc

    r47f985 r7e53d9  
    981981 
    982982  // Creare dp,S ring and change to it
    983   syzstr->syRing = rCurrRingAssure_dp_C();
     983  syzstr->syRing = rAssure_dp_C(origR, TRUE);
     984  rChangeCurrRing(syzstr->syRing);
    984985
    985986  // set initial ShiftedComps
  • kernel/syz3.cc

    r47f985 r7e53d9  
    17661766  syStrategy syzstr=(syStrategy)omAlloc0(sizeof(ssyStrategy));
    17671767/*--- changes to a Cdp-ring ----------------------------*/
    1768   syzstr->syRing = rCurrRingAssure_C_dp();
     1768  syzstr->syRing = rAssure_C_dp(origR, TRUE); rChangeCurrRing(syzstr->syRing);
    17691769/*--- initializes the data structures---------------*/
    17701770  syzstr->length = *length = (currRing->N)+2;
     
    18781878          int len=0,reg=0;
    18791879          intvec *w=NULL;
    1880           ring dp_C_ring = rCurrRingAssure_dp_C();
    1881           initial = idrMoveR_NoSort(initial, syzstr->syRing);
     1880          ring dp_C_ring = rAssure_dp_C(currRing, TRUE); rChangeCurrRing(dp_C_ring);       
     1881          initial = idrMoveR_NoSort(initial, syzstr->syRing, dp_C_ring);
    18821882          resolvente res = sySchreyerResolvente(initial,-1,&len,TRUE, TRUE);
    18831883          intvec * dummy = syBetti(res,len,&reg, w);
  • libpolys/polys/monomials/ring.h

    r47f985 r7e53d9  
    633633{ assume(r != NULL); return (rIsSyzIndexRing(r)? r->typ[0].data.syz.limit : 0);}
    634634
     635void   rSetSyzComp(int k, const ring r);
     636
    635637// Ring Manipulations
    636 ring   rAssure_HasComp(const ring r);
     638ring   rAssure_HasComp(const ring r, BOOLEAN complete = TRUE);
    637639ring   rAssure_SyzComp(const ring r, BOOLEAN complete = TRUE);
    638 void   rSetSyzComp(int k, const ring r);
    639 ring   rAssure_dp_S(const ring r);
    640 ring   rAssure_dp_C(const ring r);
    641 ring   rAssure_C_dp(const ring r);
     640ring   rAssure_dp_S(const ring r, BOOLEAN complete = TRUE);
     641ring   rAssure_dp_C(const ring r, BOOLEAN complete = TRUE);
     642ring   rAssure_C_dp(const ring r, BOOLEAN complete = TRUE);
    642643/// makes sure that c/C ordering is last ordering
    643 ring rAssure_CompLastBlock(const ring r);
     644ring   rAssure_CompLastBlock(const ring r, BOOLEAN complete = TRUE);
    644645
    645646/// makes sure that c/C ordering is last ordering and SyzIndex is first
    646 ring   rAssure_SyzComp_CompLastBlock(const ring r);
    647 ring rAssure_TDeg(ring r, int start_var, int end_var, int &pos);
     647ring   rAssure_SyzComp_CompLastBlock(const ring r, BOOLEAN complete = TRUE);
     648ring   rAssure_TDeg(const ring r, int start_var, int end_var, int &pos, BOOLEAN complete = TRUE);
    648649
    649650/// return the max-comonent wchich has syzIndex i
Note: See TracChangeset for help on using the changeset viewer.