Changeset 750069 in git for Singular/dyn_modules/syzextra/syzextra.cc

Timestamp:

Sep 22, 2016, 3:41:32 PM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '6e5adcba05493683b94648c659a729c189812c77')

Children:

4ef909357cd2764e39044e78dc5f8f271de19c21

Parents:

c4ea0bb97e0fcd6d7e4ea58106ce9935683b32de6c086a438d710cf8f1f5eac494377370eacf969c

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2016-09-22 15:41:32+02:00

git-committer:

GitHub <noreply@github.com>2016-09-22 15:41:32+02:00

Message:

Merge pull request #789 from adipopescu/Reduce_Bound

Reduce bound

File:

• Singular/dyn_modules/syzextra/syzextra.cc (modified) (10 diffs)

Singular/dyn_modules/syzextra/syzextra.cc

@@ -166 +166 @@
     pNext(s) = NULL;
 
-    if( !n_IsZero( p_GetCoeff(s, R), R) )
+    if( !n_IsZero( pGetCoeff(s), R->cf) )
     {
       const int i = p_GetComp(s, R) - 1;
@@ -480 +480 @@
 
     poly m = p_LmInit(p, r);
-    p_SetCoeff0(m, n_Copy(p_GetCoeff(p, r), r), r);
+    p_SetCoeff0(m, n_Copy(pGetCoeff(p), r->cf), r);
 
     if( bSetZeroComp )
@@ -647 +647 @@
       {
         poly ss = p_LmInit(t, r);
-        p_SetCoeff0(ss, n_Init(1, r), r); // for delete & printout only!...
+        p_SetCoeff0(ss, n_Init(1, r->cf), r); // for delete & printout only!...
         p_SetComp(ss, (*vit)->label() + 1, r); // coeff?
         p_Setm(ss, r);
@@ -1640 +1640 @@
        p_Test(multiplier, r);
 
-       if( !n_Equal( pGetCoeff(multiplier), pGetCoeff(itr->first), r) ) // normalize coeffs!?
+       if( !n_Equal( pGetCoeff(multiplier), pGetCoeff(itr->first), r->cf) ) // normalize coeffs!?
        {
-         number n = n_Div( pGetCoeff(multiplier), pGetCoeff(itr->first), r); // new number
+         number n = n_Div( pGetCoeff(multiplier), pGetCoeff(itr->first), r->cf); // new number
 
          if( UNLIKELY( OPT__TREEOUTPUT ) )
          {
            StringSetS("");
-           n_Write(n, r);
+           n_Write(n, r->cf);
            char* s = StringEndS();
            Print("\"recale\": \"%s\", ", s);
@@ -1656 +1656 @@
 
          p = p_Mult_nn(p, n, r); // !
-         n_Delete(&n, r);
+         n_Delete(&n, r->cf);
        } else
          if( UNLIKELY( OPT__PROT ) ) ++ m_stat[6]; // PrintS("l"); // lookup no rescale
@@ -2216 +2216 @@
 //  assume ( !n_IsZero( p_GetCoeff(product, r), r ) );
 
-  assume ( !n_IsZero( p_GetCoeff(lt(), r), r ) );
+  assume ( !n_IsZero( pGetCoeff(lt()), r->cf ) );
   assume( sev() == p_GetShortExpVector(lt(), r) );
 
@@ -2238 +2238 @@
 bool CLeadingTerm::DivisibilityCheck(const poly m, const poly t, const unsigned long not_sev, const ring r) const
 {
-  assume ( !n_IsZero( p_GetCoeff(lt(), r), r ) );
+  assume ( !n_IsZero( pGetCoeff(lt()), r->cf ) );
   assume( sev() == p_GetShortExpVector(lt(), r) );
 
   assume( m != NULL );
   assume( t != NULL );
-  assume ( !n_IsZero( p_GetCoeff(m, r), r ) );
-  assume ( !n_IsZero( p_GetCoeff(t, r), r ) );
+  assume ( !n_IsZero( pGetCoeff(m), r->cf ) );
+  assume ( !n_IsZero( pGetCoeff(t), r->cf ) );
 
 // assume( p_GetComp(m, r) == 0 );
@@ -2521 +2521 @@
       assume( m != NULL );
       assume( t != NULL );
-      assume ( !n_IsZero( p_GetCoeff(m, m_rBaseRing), m_rBaseRing ) );
-      assume ( !n_IsZero( p_GetCoeff(t, m_rBaseRing), m_rBaseRing ) );
+      assume ( !n_IsZero( pGetCoeff(m), m_rBaseRing->cf ) );
+      assume ( !n_IsZero( pGetCoeff(t), m_rBaseRing->cf ) );
 
       p_Test(m, m_rBaseRing);
@@ -2705 +2705 @@
     }
 
-    number n = n_Mult( p_GetCoeff(multiplier, r), p_GetCoeff(t, r), r);
+    number n = n_Mult( pGetCoeff(multiplier), pGetCoeff(t), r->cf);
 
 #if NODIVISION
     // we assume all leading coeffs to be 1!
-    assume( n_IsOne(p_GetCoeff(p, r), r->cf) );
+    assume( n_IsOne(pGetCoeff(p), r->cf) );
 #else
-    if( !n_IsOne( p_GetCoeff(p, r), r ) )
-      n = n_Div(n, p_GetCoeff(p, r), r);
-#endif
-
-    p_SetCoeff0(q, n_InpNeg(n, r), r);
+    if( !n_IsOne( pGetCoeff(p), r ) )
+      n = n_Div(n, pGetCoeff(p), r->cf);
+#endif
+
+    p_SetCoeff0(q, n_InpNeg(n, r->cf), r);
 //    n_Delete(&n, r);
 
@@ -2921 +2921 @@
 #if NODIVISION
     assume( n_IsOne(p_GetCoeff(p, r), r->cf) );
-    p_SetCoeff0(q, n_InpNeg( n_Copy(p_GetCoeff(product, r), r), r), r);
+    p_SetCoeff0(q, n_InpNeg( n_Copy(pGetCoeff(product), r->cf), r->cf), r);
 #else
-    p_SetCoeff0(q, n_InpNeg( n_Div( p_GetCoeff(product, r), p_GetCoeff(p, r), r), r), r);
+    p_SetCoeff0(q, n_InpNeg( n_Div( pGetCoeff(product), p_GetCoeff(p), r->cf), r->cf), r);
 #endif