Changeset de0a2a in git

Timestamp:

Feb 28, 2012, 7:33:43 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'a800fe4b3e9d37a38c5a10cc0ae9dfa0c15a4ee6')

Children:

986225e4b879695a1828864dc45519cbf8a0f681

Parents:

fc27468621ec9097867dc720d52d6c16471de8d3

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-28 19:33:43+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-03-05 17:42:52+01:00

Message:

minor improvements to IS ordering

chg: better rDebugPrint output
chg: better pSetm_General (assumes on better places)

Location:

libpolys/polys/monomials

Files:

• p_polys.cc (modified) (2 diffs)
• ring.cc (modified) (1 diff)

libpolys/polys/monomials/p_polys.cc

@@ -337 +337 @@
             c--;
 
-            assume( c < IDELEMS(F) ); // What about others???
-
             if( c >= IDELEMS(F) )
               break;
 
+            assume( c < IDELEMS(F) ); // What about others???
+            
             const poly pp = F->m[c]; // get reference monomial!!!
 
+            if(pp == NULL)
+              break;
+            
             assume(pp != NULL);
 
@@ -352 +355 @@
 #endif
 #endif
-            if(pp == NULL) break;
 
             const int end = o->data.is.end;

libpolys/polys/monomials/ring.cc

@@ -4075 +4075 @@
 //      for( int k = 0; k <= r->N; k++) if (r->typ[j].data.is.pVarOffset[k] != -1) Print("[%2d]: %04x; ", k, r->typ[j].data.is.pVarOffset[k]);
 
-      Print("  limit %d\n",r->typ[j].data.is.limit);
+      Print("  limit %d",r->typ[j].data.is.limit);
       #ifndef NDEBUG
       //PrintS("  F: ");idShow(r->typ[j].data.is.F, r, r, 1);
       #endif
 
-      PrintS("weights: ");
+      PrintS(", weights: ");
 
       if( r->typ[j].data.is.componentWeights == NULL )