Changeset e4f491 in git

Timestamp:

Feb 21, 2012, 2:28:22 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

74f51f261514079d9bce01fd1a8ffed4de458527

Parents:

5c0183a7fbcc63348c4fbf0ae70d97f6d0fcb203

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-21 14:28:22+01:00

git-committer:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-23 20:35:10+01:00

Message:

fix the Schreyer ordering for bigger components...

File:

• libpolys/polys/monomials/p_polys.cc (modified) (4 diffs)

libpolys/polys/monomials/p_polys.cc

@@ -286 +286 @@
           const ideal F = o->data.is.F;
           const int limit = o->data.is.limit;
+          assume( limit >= 0 );
           const int start = o->data.is.start;
-           
 
           if( F != NULL && c > limit )
@@ -298 +298 @@
 #endif
 #endif
+//          if( c > limit ) // BUG???
+            p->exp[start] = 1;
+//          else
+//            p->exp[start] = 0;
+
 
             c -= limit;
@@ -305 +310 @@
             assume( c < IDELEMS(F) ); // What about others???
 
+            if( c >= IDELEMS(F) )
+              break;
+
             const poly pp = F->m[c]; // get reference monomial!!!
+
+            assume(pp != NULL);
 
 #ifndef NDEBUG
@@ -313 +323 @@
 #endif
 #endif
-
-
-            assume(pp != NULL);
             if(pp == NULL) break;
 
             const int end = o->data.is.end;
-
             assume(start <= end);
-             
-//          const int limit = o->data.is.limit;
-          assume( limit >= 0 );
+
 
 //        const int st = o->data.isTemp.start;       
-
-//          if( c > limit ) // BUG???
-            p->exp[start] = 1;
-//          else
-//            p->exp[start] = 0;
-
 
 #ifndef NDEBUG
             Print("p_Setm_General: is(-Temp-) :: c: %d, limit: %d, [st:%d] ===>>> %ld\n", c, limit, start, p->exp[start]);
-#endif       
+#endif
 
             // p_ExpVectorAdd(p, pp, r);