Ignore:
Timestamp:
Aug 2, 2012, 8:11:43 PM (11 years ago)
Author:
Oleksandr Motsak <motsak@…>
Branches:
(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'ad2543eab51733612ba7d118afc77edca719600e')
Children:
5cecde90d96d1acc0cbd216cf0037bd2db293c31
Parents:
dd24e5dded66979eda13e955b93fc284cbb341e7
git-author:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-08-02 20:11:43+02:00
git-committer:
Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-07 04:41:46+02:00
Message:
made all classes inherit from SchreyerSyzygyComputationFlags

chg: moved the base ring into attributes (no need in extra ring argument)
chg: removed __SYZCHECK__ (only relevant for schreyer.lib)
File:
1 edited

Legend:

Unmodified
Added
Removed
  • dyn_modules/syzextra/mod_main.cc

    rdd24e5 r495328  
    517517//  const BOOLEAN __TAILREDSYZ__ = attributes.__TAILREDSYZ__;
    518518
    519   const ring r = currRing;
     519  const ring r = attributes.m_rBaseRing;
    520520  NoReturn(res);
    521521
     
    544544    h = h->Next(); assume (h == NULL);
    545545
    546     const ideal newid = ComputeLeadingSyzygyTerms(id, r, attributes);
     546    const ideal newid = ComputeLeadingSyzygyTerms(id, attributes);
    547547   
    548548    res->data = newid; res->rtyp = MODUL_CMD;
     
    569569  NoReturn(res);
    570570
    571   const ring r = currRing;
     571  const ring r = attributes.m_rBaseRing;
    572572  NoReturn(res);
    573573
     
    629629//  const BOOLEAN __TAILREDSYZ__ = attributes.__TAILREDSYZ__;
    630630
    631   const ring r = currRing;
     631  const ring r = attributes.m_rBaseRing;
    632632  NoReturn(res);
    633633
     
    656656    h = h->Next(); assume (h == NULL);
    657657
    658     res->data = Compute2LeadingSyzygyTerms(id, r, attributes);
     658    res->data = Compute2LeadingSyzygyTerms(id, attributes);
    659659    res->rtyp = MODUL_CMD;
    660660
     
    680680
    681681  const char* usage = "`FindReducer(<poly/vector>, <vector/0>, <ideal/module>[,<module>])` expected";
    682   const ring r = currRing;
     682  const ring r = attributes.m_rBaseRing;
    683683
    684684  NoReturn(res);
     
    750750
    751751  res->rtyp = VECTOR_CMD;
    752   res->data = FindReducer(product, syzterm, L, LS, r, attributes);
     752  res->data = FindReducer(product, syzterm, L, LS, attributes);
    753753
    754754  if( __DEBUG__ )
     
    774774
    775775  const char* usage = "`SchreyerSyzygyNF(<vector>, <vector>, <ideal/module>, <ideal/module>[,<module>])` expected";
    776   const ring r = currRing;
     776  const ring r = attributes.m_rBaseRing;
    777777
    778778  NoReturn(res);
     
    852852 
    853853  res->rtyp = VECTOR_CMD;
    854   res->data = SchreyerSyzygyNF(syz_lead, syz_2, L, T, LS, r, attributes);
     854  res->data = SchreyerSyzygyNF(syz_lead, syz_2, L, T, LS, attributes);
    855855
    856856  if( __DEBUG__ )
     
    873873
    874874  const BOOLEAN __DEBUG__      = attributes.__DEBUG__;
    875   const BOOLEAN __SYZCHECK__   = attributes.__SYZCHECK__;
     875//  const BOOLEAN __SYZCHECK__   = attributes.__SYZCHECK__;
    876876//   const BOOLEAN __LEAD2SYZ__   = attributes.__LEAD2SYZ__;
    877877//   const BOOLEAN __HYBRIDNF__   = attributes.__HYBRIDNF__;
     
    879879
    880880  const char* usage = "`ReduceTerm(<poly>, <poly/vector>, <vector/0>, <ideal/module>, <ideal/module>[,<module>])` expected";
    881   const ring r = currRing;
     881  const ring r = attributes.m_rBaseRing;
    882882
    883883  NoReturn(res);
     
    970970
    971971
    972   if (__SYZCHECK__ && syztermCheck != NULL)
     972  if (__DEBUG__ && syztermCheck != NULL)
    973973  {
    974974    const int c = p_GetComp(syztermCheck, r) - 1;
     
    992992
    993993  res->rtyp = VECTOR_CMD;
    994   res->data = ReduceTerm(multiplier, term4reduction, syztermCheck, L, T, LS, r, attributes);
     994  res->data = ReduceTerm(multiplier, term4reduction, syztermCheck, L, T, LS, attributes);
    995995
    996996
     
    10211021
    10221022  const char* usage = "`TraverseTail(<poly>, <poly/vector>, <ideal/module>, <ideal/module>[,<module>])` expected";
    1023   const ring r = currRing;
     1023  const ring r = attributes.m_rBaseRing;
    10241024
    10251025  NoReturn(res);
     
    10991099
    11001100  res->rtyp = VECTOR_CMD;
    1101   res->data = TraverseTail(multiplier, tail, L, T, LS, r, attributes);
     1101  res->data = TraverseTail(multiplier, tail, L, T, LS, attributes);
    11021102
    11031103
     
    11261126
    11271127  const char* usage = "`ComputeSyzygy(<ideal/module>, <ideal/module>])` expected";
    1128   const ring r = currRing;
     1128  const ring r = attributes.m_rBaseRing;
    11291129
    11301130  NoReturn(res);
     
    11631163  ideal LL, TT;
    11641164
    1165   ComputeSyzygy(L, T, LL, TT, r, attributes);
     1165  ComputeSyzygy(L, T, LL, TT, attributes);
    11661166
    11671167  lists l = (lists)omAllocBin(slists_bin); l->Init(2);
Note: See TracChangeset for help on using the changeset viewer.