Changeset 5c0183 in git

Timestamp:

Feb 17, 2012, 4:44:11 PM (11 years ago)

Author:

Oleksandr Motsak <motsak@…>

Branches:

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

Children:

e4f491963f9660b7e75c9817b20efcc8c5fae6fa

Parents:

98c9729eb3e7d8dbe8cbfa1932442589173c8270

git-author:

Oleksandr Motsak <motsak@mathematik.uni-kl.de>2012-02-17 16:44:11+01:00

git-committer:

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

Message:

fix the induced Schreyer ordering

add: a test due to Chrisian
add: enable detailed debug for the ordering
fix: bugs in induced Schreyer ordering(!?)
fix: the ordering (due to negative offset!)

Files:

• dyn_modules/syzextra/ederc.tst (added)
• dyn_modules/syzextra/mod_main.cc (modified) (4 diffs)
• libpolys/polys/monomials/p_polys.cc (modified) (8 diffs)

dyn_modules/syzextra/mod_main.cc

@@ -111 +111 @@
   {
     const ring r = (const ring)h->Data();
-    rWrite(r);
+    rWrite(r, TRUE);
     PrintLn();
 #ifdef RDEBUG
@@ -681 +681 @@
   const int posIS = rGetISPos(0, r);
 
-  if( (!isSyz) && (-1 == posIS) )
-  {
-    WerrorS("`idPrepare(<...>)` called on incompatible ring (not created by 'MakeSyzCompOrdering' or 'MakeInducedSchreyerOrdering'!)");
-    return TRUE;
-  }
 
   if ( !( (h!=NULL) && (h->Typ()==MODUL_CMD) && (h->Data() != NULL) ) )
@@ -706 +701 @@
   } else
   {
+      if( (!isSyz) && (-1 == posIS) )
+      {
+        WerrorS("`idPrepare(<...>)` called on incompatible ring (not created by 'MakeSyzCompOrdering' or 'MakeInducedSchreyerOrdering'!)");
+        return TRUE;
+      }
+
     if( isSyz )
       iComp = rGetCurrSyzLimit(r);
@@ -711 +712 @@
       iComp = id_RankFreeModule(r->typ[posIS].data.is.F, r); // ;
   }
+  
+  assume(iComp >= 0);
 
 

libpolys/polys/monomials/p_polys.cc

@@ -227 +227 @@
 #ifndef NDEBUG
 #if MYTEST
-          Print("p_Setm_General: isTemp ord: pos: %d, p: ", pos);  p_DebugPrint(p, r, r, 1);
+          Print("p_Setm_General: ro_isTemp ord: pos: %d, p: ", pos);  p_DebugPrint(p, r, r, 1);
 #endif
 #endif
@@ -264 +264 @@
 #if MYTEST
 //          if( p->exp[o->data.isTemp.start] > 0 )
-//          {
-//            PrintS("Initial Value: "); p_DebugPrint(p, r, r, 1);
-//          }
+            PrintS("after Values: "); p_DebugPrint(p, r, r, 1);
 #endif
 #endif
@@ -288 +286 @@
           const ideal F = o->data.is.F;
           const int limit = o->data.is.limit;
+          const int start = o->data.is.start;
+           
 
           if( F != NULL && c > limit )
@@ -294 +294 @@
 #if MYTEST
             Print("p_Setm_General: ro_is : in rSetm: pos: %d, c: %d >  limit: %d\n", c, pos, limit); // p_DebugPrint(p, r, r, 1);
+            PrintS("preComputed Values: ");
+            p_DebugPrint(p, r, r, 1);
 #endif
 #endif
@@ -316 +318 @@
             if(pp == NULL) break;
 
-            const int start = o->data.is.start;
             const int end = o->data.is.end;
 
@@ -326 +327 @@
 //        const int st = o->data.isTemp.start;       
 
-          if( c > limit )
+//          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]);
+            Print("p_Setm_General: is(-Temp-) :: c: %d, limit: %d, [st:%d] ===>>> %ld\n", c, limit, start, p->exp[start]);
 #endif       
-   
+
+            // p_ExpVectorAdd(p, pp, r);
 
             for( int i = start; i <= end; i++) // v[0] may be here...
               p->exp[i] += pp->exp[i]; // !!!!!!!! ADD corresponding LT(F)
 
-       
-
-             
+            // p_MemAddAdjust(p, ri);
+            if (r->NegWeightL_Offset != NULL)
+            {
+              for (int i=r->NegWeightL_Size-1; i>=0; i--)
+              {
+                const int _i = r->NegWeightL_Offset[i];
+                if( start <= _i && _i <= end )
+                  p->exp[_i] -= POLY_NEGWEIGHT_OFFSET;
+              }
+            }
+
+
 #ifndef NDEBUG
             const int* const pVarOffset = o->data.is.pVarOffset;
@@ -356 +367 @@
             }
             // TODO: how to check this for computed values???
+#if MYTEST
+            PrintS("Computed Values: "); p_DebugPrint(p, r, r, 1);
+#endif
 #endif
           } else
           {
+            p->exp[start] = 0; //!!!!????? where?????
+             
             const int* const pVarOffset = o->data.is.pVarOffset;
 
@@ -370 +386 @@
 #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]);
+            Print("ELSE 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       
+#endif
+#endif
           }
-           
 
           break;