Changeset e98c64 in git for dyn_modules/syzextra/syzextra.cc

Timestamp:

Aug 9, 2012, 9:27:42 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', '1d362c315e551a5b527ab0759f8839cf0e94f3a5')

Children:

c814238a3c69aaf59662652396c4843d8c8c52fa

Parents:

5cecde90d96d1acc0cbd216cf0037bd2db293c31

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-08-09 21:27:42+02:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2014-05-07 04:41:46+02:00

Message:

adding IGNORETAILS option for computing pure Schreyer Frames (test with 'testAGRFrame')

File:

• dyn_modules/syzextra/syzextra.cc (modified) (11 diffs)

dyn_modules/syzextra/syzextra.cc

@@ -516 +516 @@
   assume( m_syzLeads != NULL );
 
-  if( __TAILREDSYZ__ )
-    assume( m_checker.IsNonempty() );
-
   ideal& LL = m_syzLeads;
 
@@ -534 +531 @@
     const poly a = LL->m[k]; assume( a != NULL );
 
-    const int r = p_GetComp(a, R) - 1; 
-
-    assume( r >= 0 && r < IDELEMS(T) );
-    assume( r >= 0 && r < IDELEMS(L) );
-
-    poly aa = leadmonom(a, R); assume( aa != NULL); // :(    
-
     poly a2 = pNext(a);    
 
     // Splitting 2-terms Leading syzygy module
     if( a2 != NULL )
+      pNext(a) = NULL;
+
+    if( __IGNORETAILS__ )
     {
-      TT->m[k] = a2; pNext(a) = NULL;
+      TT->m[k] = NULL;
+
+      if( a2 != NULL )
+        p_Delete(&a2, R);
+
+      continue;
     }
+    
+    TT->m[k] = a2;
+
+    const int r = p_GetComp(a, R) - 1; 
+
+    assume( r >= 0 && r < IDELEMS(T) );
+    assume( r >= 0 && r < IDELEMS(L) );          
+
+    poly aa = leadmonom(a, R); assume( aa != NULL); // :(
 
     if( ! __HYBRIDNF__ )
@@ -579 +586 @@
       p_Delete(&a2, R);
     }
+
     p_Delete(&aa, R);    
   }
@@ -591 +599 @@
 //  const BOOLEAN __LEAD2SYZ__   = attributes.__LEAD2SYZ__;
 //  const BOOLEAN __TAILREDSYZ__ = attributes.__TAILREDSYZ__;
+
+  assume( m_syzLeads == NULL );
 
   if( bComputeSecondTerms )
@@ -609 +619 @@
   assume( m_syzLeads!= NULL );
 
-  if (__TAILREDSYZ__ && (IDELEMS(m_syzLeads) > 0))
+  if (__TAILREDSYZ__ && (IDELEMS(m_syzLeads) > 0) && !__IGNORETAILS__)
   {
     m_LS = m_syzLeads;
     m_checker.Initialize(m_syzLeads);
-  }
-
-  (void)( __LEAD2SYZ__ );
+    assume( m_checker.IsNonempty() ); // TODO: this always fails... BUG????
+  }
 }
 
@@ -627 +636 @@
 // {
 
+  assume( !__IGNORETAILS__ );
+
   const ideal& L = m_idLeads;
   const ideal& T = m_idTails;
@@ -691 +702 @@
 poly SchreyerSyzygyComputation::TraverseTail(poly multiplier, poly tail) const
 {
+  assume( !__IGNORETAILS__ );
+
   const ideal& L = m_idLeads;
   const ideal& T = m_idTails;
@@ -730 +743 @@
 poly SchreyerSyzygyComputation::ReduceTerm(poly multiplier, poly term4reduction, poly syztermCheck) const
 {
+  assume( !__IGNORETAILS__ );
+
   const ideal& L = m_idLeads;
   const ideal& T = m_idTails;
@@ -809 +824 @@
     __TAILREDSYZ__( (BOOLEAN)atGetInt(rootRingHdl, "TAILREDSYZ", 1) ), 
     __HYBRIDNF__( (BOOLEAN)atGetInt(rootRingHdl, "HYBRIDNF", 0) ),
+    __IGNORETAILS__( (BOOLEAN)atGetInt(rootRingHdl, "IGNORETAILS", 0) ),
     m_rBaseRing( rootRingHdl->data.uring )
 {    
@@ -814 +830 @@
   {
     PrintS("SchreyerSyzygyComputationFlags: \n");
-    Print("   DEBUG     : \t%d\n", __DEBUG__);
+    Print("        DEBUG: \t%d\n", __DEBUG__);
 //    Print("   SYZCHECK  : \t%d\n", __SYZCHECK__);
-    Print("   LEAD2SYZ  : \t%d\n", __LEAD2SYZ__);
+    Print("     LEAD2SYZ: \t%d\n", __LEAD2SYZ__);
     Print("   TAILREDSYZ: \t%d\n", __TAILREDSYZ__);
+    Print("  IGNORETAILS: \t%d\n", __IGNORETAILS__);
+    
   }
 
@@ -982 +1000 @@
   const TReducers& reducers = it->second;
 
-  const BOOLEAN to_check = __TAILREDSYZ__ && (syz_checker.IsNonempty());
+  const BOOLEAN to_check = (syz_checker.IsNonempty()); // __TAILREDSYZ__ && 
 
   const poly q = p_New(r); pNext(q) = NULL;