Changeset aa353e in git


Ignore:
Timestamp:
Apr 10, 2015, 2:23:59 PM (8 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')
Children:
9383ae8c2345574530bbcaa9082f475a84fcbf0f
Parents:
8024837072c7be2a09fc786de78354ac60cb89c6
Message:
opt. enterS, enterT: reference instead of copy for L/TObject
Location:
kernel/GBEngine
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • kernel/GBEngine/kstd1.cc

    r802483 raa353e  
    747747        if (ei <= H.ecart) break;
    748748        if (((strat->T[j].ecart < ei)
    749           || ((strat->T[j].ecart == ei)
    750         && (strat->T[j].length < li)))
     749          || ((strat->T[j].ecart == ei) && (strat->T[j].length < li)))
    751750        && pLmShortDivisibleBy(strat->T[j].p,strat->sevT[j], H.p, not_sev))
    752751        {
     
    12131212*  - reorders s,L
    12141213*/
    1215 void enterSMora (LObject p,int atS,kStrategy strat, int atR = -1)
     1214void enterSMora (LObject &p,int atS,kStrategy strat, int atR = -1)
    12161215{
    12171216  enterSBba(p, atS, strat, atR);
     
    12671266*  - computes noether
    12681267*/
    1269 void enterSMoraNF (LObject p, int atS,kStrategy strat, int atR = -1)
     1268void enterSMoraNF (LObject &p, int atS,kStrategy strat, int atR = -1)
    12701269{
    12711270  enterSBba(p, atS, strat, atR);
  • kernel/GBEngine/kutil.cc

    r802483 raa353e  
    69266926* -saves the result in S
    69276927*/
    6928 void enterSBba (LObject p,int atS,kStrategy strat, int atR)
     6928void enterSBba (LObject &p,int atS,kStrategy strat, int atR)
    69296929{
    69306930  strat->news = TRUE;
     
    70297029* -saves the result in S
    70307030*/
    7031 void enterSSba (LObject p,int atS,kStrategy strat, int atR)
     7031void enterSSba (LObject &p,int atS,kStrategy strat, int atR)
    70327032{
    70337033  strat->news = TRUE;
     
    71607160* puts p to the set T at position atT
    71617161*/
    7162 void enterT(LObject p, kStrategy strat, int atT)
     7162void enterT(LObject &p, kStrategy strat, int atT)
    71637163{
    71647164  int i;
     
    72397239* puts signature p.sig to the set syz
    72407240*/
    7241 void enterSyz(LObject p, kStrategy strat, int atT)
     7241void enterSyz(LObject &p, kStrategy strat, int atT)
    72427242{
    72437243  int i;
     
    87798779int redFirst (LObject* h,kStrategy strat);
    87808780int redEcart (LObject* h,kStrategy strat);
    8781 void enterSMora (LObject p,int atS,kStrategy strat, int atR=-1);
    8782 void enterSMoraNF (LObject p,int atS,kStrategy strat, int atR=-1);
     8781void enterSMora (LObject &p,int atS,kStrategy strat, int atR=-1);
     8782void enterSMoraNF (LObject &p,int atS,kStrategy strat, int atR=-1);
    87838783// ../Singular/misc.cc:
    87848784extern char *  showOption();
  • kernel/GBEngine/kutil.h

    r802483 raa353e  
    284284  int (*posInL)(const LSet set, const int length,
    285285                LObject* L,const kStrategy strat);
    286   void (*enterS)(LObject h, int pos,kStrategy strat, int atR/* =-1*/ );
     286  void (*enterS)(LObject &h, int pos,kStrategy strat, int atR/* =-1*/ );
    287287  void (*initEcartPair)(LObject * h, poly f, poly g, int ecartF, int ecartG);
    288288  int (*posInLOld)(const LSet Ls,const int Ll,
     
    419419void deleteInL(LSet set, int *length, int j,kStrategy strat);
    420420void enterL (LSet *set,int *length, int *LSetmax, LObject p,int at);
    421 void enterSBba (LObject p,int atS,kStrategy strat, int atR = -1);
    422 void enterSSba (LObject p,int atS,kStrategy strat, int atR = -1);
     421void enterSBba (LObject &p,int atS,kStrategy strat, int atR = -1);
     422void enterSSba (LObject &p,int atS,kStrategy strat, int atR = -1);
    423423void initEcartPairBba (LObject* Lp,poly f,poly g,int ecartF,int ecartG);
    424424void initEcartPairMora (LObject* Lp,poly f,poly g,int ecartF,int ecartG);
     
    524524void initSyzRules (kStrategy strat);
    525525void updateS(BOOLEAN toT,kStrategy strat);
    526 void enterSyz (LObject p,kStrategy strat, int atT);
    527 void enterT (LObject p,kStrategy strat, int atT = -1);
     526void enterSyz (LObject &p,kStrategy strat, int atT);
     527void enterT (LObject &p,kStrategy strat, int atT = -1);
    528528void cancelunit (LObject* p,BOOLEAN inNF=FALSE);
    529529void HEckeTest (poly pp,kStrategy strat);
Note: See TracChangeset for help on using the changeset viewer.