Changeset d30a399 in git for libpolys/polys

Timestamp:

Oct 19, 2012, 9:59:20 AM (12 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

8710ff0734063b049b29453b8d06161041fffbc7b37b3984a12e1552c7bafc9fd5a7849240ea7980

Parents:

f2359093b446e8c68c3bda0f0484c4dbf7bd93a8

Message:

chg: option handling: test,verbose renamed to si_opt_1,si_opt_2

Location:

libpolys/polys/monomials

Files:

• p_polys.cc (modified) (5 diffs)
• ring.cc (modified) (1 diff)
• ring.h (modified) (1 diff)

libpolys/polys/monomials/p_polys.cc

@@ -246 +246 @@
           const int limit = o->data.syz.limit;
 
-          if (c > limit)
+          if (c > (unsigned long)limit)
             p->exp[place] = o->data.syz.curr_index;
           else if (c > 0)
           {
-            assume( (1 <= c) && (c <= limit) );
+            assume( (1 <= c) && (c <= (unsigned long)limit) );
             p->exp[place]= o->data.syz.syz_index[c];
           }
@@ -530 +530 @@
   p_LmCheckPolyRing(p, r);
   int i, k;
-  int pIS = 0;
   long j =0;
 
@@ -1914 +1913 @@
   assume( ph != NULL );
 
-  assume( r != NULL ); assume( r->cf != NULL ); const coeffs C = r->cf;
+  assume( r != NULL ); assume( r->cf != NULL ); 
 
 
@@ -1920 +1919 @@
   if( 0 )
   {
+    const coeffs C = r->cf;
       // experimentall (recursive enumerator treatment) of alg. Ext!
     CPolyCoeffsEnumerator itr(ph);
@@ -1977 +1977 @@
       n_ClearContent(itr, r->cf);
 
-      p_Test(ph, r); n_Test(pGetCoeff(ph), C);
-      assume(n_GreaterZero(pGetCoeff(ph), C)); // ??
+      p_Test(ph, r); n_Test(pGetCoeff(ph), r->cf);
+      assume(n_GreaterZero(pGetCoeff(ph), r->cf)); // ??
       
       // if(!n_GreaterZero(pGetCoeff(ph),r->cf)) ph = p_Neg(ph,r);

libpolys/polys/monomials/ring.cc

@@ -3430 +3430 @@
   if (complete)
   {
-    test &= ~ TEST_RINGDEP_OPTS;
-    test |= r->options;
+    si_opt_1 &= ~ TEST_RINGDEP_OPTS;
+    si_opt_1 |= r->options;
   }
 }

libpolys/polys/monomials/ring.h

@@ -659 +659 @@
   if( ret )
   {
-    const ring R = C->extRing;
-    assume( R != NULL );
+    assume( (C->extRing) != NULL );
     BOOLEAN idIs0 (ideal h);
-    assume( !idIs0(R->qideal) );
+    assume((!((C->extRing)->qideal==NULL)) && (!idIs0((C->extRing)->qideal)));
   }