Changeset 6e66d2 in git

Timestamp:

Apr 26, 2011, 9:50:17 PM (12 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

ad443e05c5a0a8d8094e178a420b4bc322c757c0

Parents:

4be94358d35989a4285e3c28d99bc11c43898790

Message:

FIX: Schreyer ordering was broken: monomials always had 0-level

From: Oleksandr Motsak <motsak@mathematik.uni-kl.de>

git-svn-id: file:///usr/local/Singular/svn/trunk@14182 2c84dea3-7e68-4137-9b89-c4e89433aadc

Location:

kernel

Files:

• p_polys.cc (modified) (8 diffs)
• ring.cc (modified) (2 diffs)

kernel/p_polys.cc

@@ -200 +200 @@
 
           assume( c >= 0 );
-          const int limit = o->data.is.limit;
-
-          assume( limit >= 0 );
 
           // Let's simulate case ro_syz above....
@@ -209 +206 @@
 
           assume( pVarOffset != NULL );
-
-          if( c > limit )
-            p->exp[o->data.isTemp.start] = 1;
-          else
-          {
-            p->exp[o->data.isTemp.start] = 0;
-          }
 
           // TODO: Can this be done in the suffix???
@@ -229 +219 @@
             }
           }
-
-        
-
+           
 #ifndef NDEBUG
           for( int i = 1; i <= r->N; i++ ) // No v[0] here!!!
@@ -242 +230 @@
             }
           }
-
+#endif
+           
+#ifndef NDEBUG
 #if MYTEST
-//          if( p->exp[o->data.isTemp.start] > 0 )
-//          {
-//            PrintS("Initial Value: "); p_DebugPrint(p, r, r, 1);
-//          }
-#endif
-#endif
-
+          PrintS("Initial Value: "); p_DebugPrint(p, r, r, 1);
+#endif
+#endif
           break;
         }
@@ -275 +261 @@
 #ifndef NDEBUG
 #if MYTEST
-            Print("is ord in rSetm: pos: %d, c: %d, limit: %d\n", c, pos, limit); // p_DebugPrint(p, r, r, 1);
+            Print("p_Setm_General: ro_is : in rSetm: pos: %d, c: %d >  limit: %d\n", c, pos, limit); // p_DebugPrint(p, r, r, 1);
 #endif
 #endif
@@ -296 +282 @@
 
 
+            assume(pp != NULL);
             if(pp == NULL) break;
 
@@ -302 +289 @@
 
             assume(start <= end);
-            assume(pp != NULL);
+             
+//          const int limit = o->data.is.limit;
+          assume( limit >= 0 );
+
+//        const int st = o->data.isTemp.start;       
+
+          if( c > limit )
+            p->exp[start] = 1;
+//          else
+//            p->exp[start] = 0;
+
+             
+#ifndef NDEBUG
+            Print("p_Setm_General: is(-Temp-) :: c: %d, limit: %d, [st:%d] ===>>> %d\n", c, limit, start, p->exp[start]);
+#endif       
+   
 
             for( int i = start; i <= end; i++) // v[0] may be here...
               p->exp[i] += pp->exp[i]; // !!!!!!!! ADD corresponding LT(F)
 
+       
+
+             
 #ifndef NDEBUG
             const int* const pVarOffset = o->data.is.pVarOffset;
@@ -338 +343 @@
             if( vo != -1 )
               p->exp[vo] = c; // initial component v[0]!
+
+#ifndef NDEBUG
+#if MYTEST
+            Print("p_Setm_General: ro_is :: c: %d <= limit: %d, vo: %d, exp: %d\n", c, limit, vo, p->exp[vo]);
+            p_DebugPrint(p, r, r, 1);
+#endif       
+#endif       
           }
+           
 
           break;

kernel/ring.cc

@@ -2801 +2801 @@
       {
 #ifndef NDEBUG
-        dReportError("Error: unhandled ordering in rModifyRing: ringorder_S = [%d]", r_ord);
+        Warn("Error: unhandled ordering in rModifyRing: ringorder_S = [%d]", r_ord);
 #endif
         order[j]=r_ord; /*r->order[i];*/
@@ -2856 +2856 @@
         if (omit_comp)
         {
-          dReportError("Error: WRONG USAGE of rModifyRing: cannot omit component due to the ordering block [%d]: %d (ringorder_IS)", i, r_ord);
+#ifndef NDEBUG
+          Warn("Error: WRONG USAGE of rModifyRing: cannot omit component due to the ordering block [%d]: %d (ringorder_IS)", i, r_ord);
+#endif
           omit_comp = FALSE;
         }