Changeset 495328 in git for dyn_modules/syzextra/mod_main.cc

Timestamp:

Aug 2, 2012, 8:11:43 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

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:

• dyn_modules/syzextra/mod_main.cc (modified) (17 diffs)

dyn_modules/syzextra/mod_main.cc

@@ -517 +517 @@
 //  const BOOLEAN __TAILREDSYZ__ = attributes.__TAILREDSYZ__;
 
-  const ring r = currRing;
+  const ring r = attributes.m_rBaseRing;
   NoReturn(res);
 
@@ -544 +544 @@
     h = h->Next(); assume (h == NULL);
 
-    const ideal newid = ComputeLeadingSyzygyTerms(id, r, attributes);
+    const ideal newid = ComputeLeadingSyzygyTerms(id,  attributes);
     
     res->data = newid; res->rtyp = MODUL_CMD;
@@ -569 +569 @@
   NoReturn(res);
 
-  const ring r = currRing;
+  const ring r = attributes.m_rBaseRing;
   NoReturn(res);
 
@@ -629 +629 @@
 //  const BOOLEAN __TAILREDSYZ__ = attributes.__TAILREDSYZ__;
 
-  const ring r = currRing;
+  const ring r = attributes.m_rBaseRing;
   NoReturn(res);
 
@@ -656 +656 @@
     h = h->Next(); assume (h == NULL);
 
-    res->data = Compute2LeadingSyzygyTerms(id, r, attributes);
+    res->data = Compute2LeadingSyzygyTerms(id, attributes);
     res->rtyp = MODUL_CMD;
 
@@ -680 +680 @@
 
   const char* usage = "`FindReducer(<poly/vector>, <vector/0>, <ideal/module>[,<module>])` expected";
-  const ring r = currRing;
+  const ring r = attributes.m_rBaseRing;
 
   NoReturn(res);
@@ -750 +750 @@
 
   res->rtyp = VECTOR_CMD;
-  res->data = FindReducer(product, syzterm, L, LS, r, attributes);
+  res->data = FindReducer(product, syzterm, L, LS, attributes);
 
   if( __DEBUG__ )
@@ -774 +774 @@
 
   const char* usage = "`SchreyerSyzygyNF(<vector>, <vector>, <ideal/module>, <ideal/module>[,<module>])` expected";
-  const ring r = currRing;
+  const ring r = attributes.m_rBaseRing;
 
   NoReturn(res);
@@ -852 +852 @@
   
   res->rtyp = VECTOR_CMD;
-  res->data = SchreyerSyzygyNF(syz_lead, syz_2, L, T, LS, r, attributes);
+  res->data = SchreyerSyzygyNF(syz_lead, syz_2, L, T, LS, attributes);
 
   if( __DEBUG__ )
@@ -873 +873 @@
 
   const BOOLEAN __DEBUG__      = attributes.__DEBUG__;
-  const BOOLEAN __SYZCHECK__   = attributes.__SYZCHECK__;
+//  const BOOLEAN __SYZCHECK__   = attributes.__SYZCHECK__;
 //   const BOOLEAN __LEAD2SYZ__   = attributes.__LEAD2SYZ__;
 //   const BOOLEAN __HYBRIDNF__   = attributes.__HYBRIDNF__;
@@ -879 +879 @@
 
   const char* usage = "`ReduceTerm(<poly>, <poly/vector>, <vector/0>, <ideal/module>, <ideal/module>[,<module>])` expected";
-  const ring r = currRing;
+  const ring r = attributes.m_rBaseRing;
 
   NoReturn(res);
@@ -970 +970 @@
 
 
-  if (__SYZCHECK__ && syztermCheck != NULL)
+  if (__DEBUG__ && syztermCheck != NULL)
   {
     const int c = p_GetComp(syztermCheck, r) - 1;
@@ -992 +992 @@
 
   res->rtyp = VECTOR_CMD;
-  res->data = ReduceTerm(multiplier, term4reduction, syztermCheck, L, T, LS, r, attributes);
+  res->data = ReduceTerm(multiplier, term4reduction, syztermCheck, L, T, LS, attributes);
 
 
@@ -1021 +1021 @@
 
   const char* usage = "`TraverseTail(<poly>, <poly/vector>, <ideal/module>, <ideal/module>[,<module>])` expected";
-  const ring r = currRing;
+  const ring r = attributes.m_rBaseRing;
 
   NoReturn(res);
@@ -1099 +1099 @@
 
   res->rtyp = VECTOR_CMD;
-  res->data = TraverseTail(multiplier, tail, L, T, LS, r, attributes);
+  res->data = TraverseTail(multiplier, tail, L, T, LS, attributes);
 
 
@@ -1126 +1126 @@
 
   const char* usage = "`ComputeSyzygy(<ideal/module>, <ideal/module>])` expected";
-  const ring r = currRing;
+  const ring r = attributes.m_rBaseRing;
 
   NoReturn(res);
@@ -1163 +1163 @@
   ideal LL, TT;
 
-  ComputeSyzygy(L, T, LL, TT, r, attributes);
+  ComputeSyzygy(L, T, LL, TT, attributes);
 
   lists l = (lists)omAllocBin(slists_bin); l->Init(2);