Changeset 67e0dc in git for kernel/ideals.cc


Ignore:
Timestamp:
Oct 21, 2015, 2:57:17 PM (9 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')
Children:
5bd9ec36b87fa8f176a21995de2b56724d67be2d
Parents:
a1b6c917a1c8886b1bba1b05680ff06cfd39c82def1a968e317a12b42f88e04cd7f9483e47fba2f7
Message:
Merge pull request #718 from adipopescu/STDChanes2

Std over rings
File:
1 edited

Legend:

Unmodified
Added
Removed

  • kernel/ideals.cc

    ref1a96 r67e0dc  
    245245
    246246  ring orig_ring=currRing;
    247   ring syz_ring=rAssure_SyzComp(orig_ring,TRUE); rChangeCurrRing(syz_ring);
     247  ring syz_ring=rAssure_SyzOrder(orig_ring,TRUE); rChangeCurrRing(syz_ring);
    248248  rSetSyzComp(length, syz_ring);
    249249
    … …  
    384384
    385385  ring orig_ring=currRing;
    386   ring syz_ring=rAssure_SyzComp(orig_ring,TRUE); rChangeCurrRing(syz_ring);
     386  ring syz_ring=rAssure_SyzOrder(orig_ring,TRUE); rChangeCurrRing(syz_ring);
    387387  rSetSyzComp(syzComp, syz_ring);
    388388
    … …  
    777777
    778778  ring orig_ring = currRing;
    779   ring syz_ring = rAssure_SyzComp(orig_ring,TRUE);  rChangeCurrRing(syz_ring);
     779  ring syz_ring = rAssure_SyzOrder(orig_ring,TRUE);  rChangeCurrRing(syz_ring);
    780780  rSetSyzComp(k,syz_ring);
    781781
    … …  
    928928    }
    929929  }
     930  s_temp->rank += k;
    930931}
    931932
    … …  
    972973
    973974  ring orig_ring=currRing;
    974   ring syz_ring=rAssure_SyzComp(orig_ring,TRUE);  rChangeCurrRing(syz_ring);
     975  ring syz_ring=rAssure_SyzOrder(orig_ring,TRUE);  rChangeCurrRing(syz_ring);
    975976  rSetSyzComp(k,syz_ring);
    976977
    … …  
    10241025      }
    10251026    }
     1027    s_temp->rank += k;
    10261028  }
    10271029  ideal s_result = kNF(s_h3,currRing->qideal,s_temp,k);
    … …  
    13331335
    13341336  ring orig_ring=currRing;
    1335   ring syz_ring=rAssure_SyzComp(orig_ring,TRUE);  rChangeCurrRing(syz_ring);
     1337  ring syz_ring=rAssure_SyzOrder(orig_ring,TRUE);  rChangeCurrRing(syz_ring);
    13361338  rSetSyzComp(kmax-1,syz_ring);
    13371339  if (orig_ring!=syz_ring)
    … …  
    19831985{
    19841986  ring orig_ring=currRing;
    1985   ring syz_ring=rAssure_SyzComp(orig_ring, TRUE); rChangeCurrRing(syz_ring);
     1987  ring syz_ring=rAssure_SyzOrder(orig_ring, TRUE); rChangeCurrRing(syz_ring);
    19861988  rSetSyzComp(length, syz_ring);
    19871989
    … …  
    21072109
    21082110  ring orig_ring=currRing;
    2109   ring syz_ring=rAssure_SyzComp(orig_ring, TRUE); rChangeCurrRing(syz_ring);
     2111  ring syz_ring=rAssure_SyzOrder(orig_ring, TRUE); rChangeCurrRing(syz_ring);
    21102112  // we can use OPT_RETURN_SB only, if syz_ring==orig_ring,
    21112113  // therefore we disable OPT_RETURN_SB for modulo:
Note: See TracChangeset for help on using the changeset viewer.