Changeset c4279b in git

Timestamp:

Dec 13, 2013, 10:03:59 AM (9 years ago)

Author:

Christian Eder

Branches:

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

Children:

55233bec0f99f7b6752ebfe613d9ada501e0d441

Parents:

d11734c14946aacc7d00348d000a1bb22c618823

Message:

fixes ring changes for degree-index-order in sba

Location:

kernel

Files:

• kstd2.cc (modified) (1 diff)
• kutil.cc (modified) (3 diffs)

kernel/kstd2.cc

@@ -2164 +2164 @@
               p_ExpVectorAdd(help,strat->S[pos],currRing);
               Q.sig = p_Add_q(Q.sig,help,currRing);
-              if (p_LmCmp(Q.sig,strat->syz[strat->syzl-1],currRing) == -currRing->OrdSgn) {
+              if (strat->sbaOrder == 0) {
+                if (p_LmCmp(Q.sig,strat->syz[strat->syzl-1],currRing) == -currRing->OrdSgn) {
+                  pos = posInSyz(strat, Q.sig);
+                  enterSyz(Q, strat, pos);
+                }
+              } else {
                 pos = posInSyz(strat, Q.sig);
                 enterSyz(Q, strat, pos);

kernel/kutil.cc

@@ -8303 +8303 @@
       return r;
     }
-    ring res = rCopy0(r, FALSE, TRUE);
-    for (int i=1; i<n-1; i++)
-    {
-      res->order[i] = res->order[i-1];
-      res->block0[i] = res->block0[i-1];
-      res->block1[i] = res->block1[i-1];
-      res->wvhdl[i] = res->wvhdl[i-1];
+    ring res = rCopy0(r, TRUE, FALSE);
+    res->order  = (int *)omAlloc0((n+1)*sizeof(int));
+    res->block0 = (int *)omAlloc0((n+1)*sizeof(int));
+    res->block1 = (int *)omAlloc0((n+1)*sizeof(int));
+    int **wvhdl = (int **)omAlloc0((n+1)*sizeof(int*));
+    res->wvhdl  = wvhdl;
+    for (int i=1; i<n; i++)
+    {
+      res->order[i]   = r->order[i-1];
+      res->block0[i]  = r->block0[i-1];
+      res->block1[i]  = r->block1[i-1];
+      res->wvhdl[i]   = r->wvhdl[i-1];
     }
 
     // new 1st block
     res->order[0]   = ringorder_C; // Prefix
-    //res->block0[0]  = 1;
-    //res->block1[0]  = res->N;
-    //res->wvhdl[j]   = NULL;
-    // res->order [j] = 0; // The End!
+    // removes useless secondary component order if defined in old ring
+    for (int i=rBlocks(res); i>0; --i) {
+      if (res->order[i] == ringorder_C || res->order[i] == ringorder_c) {
+        res->order[i] = 0;
+        break;
+      }
+    }
     rComplete(res, 1);
 #ifdef HAVE_PLURAL
@@ -8342 +8350 @@
   if (strat->sbaOrder == 3)
   {
-    printf("hh\n");
-    ring res = rCopy0(r, FALSE, TRUE);
-    for (int i=2; i<n; i++)
-    {
-      printf("i %d\n",i);
-      res->order[i] = res->order[i-2];
-      res->block0[i] = res->block0[i-2];
-      res->block1[i] = res->block1[i-2];
-      res->wvhdl[i] = res->wvhdl[i-2];
-    }
-    printf("hh2\n");
+    ring res = rCopy0(r, TRUE, FALSE);
+    res->order  = (int *)omAlloc0((n+2)*sizeof(int));
+    res->block0 = (int *)omAlloc0((n+2)*sizeof(int));
+    res->block1 = (int *)omAlloc0((n+2)*sizeof(int));
+    int **wvhdl = (int **)omAlloc0((n+2)*sizeof(int*));
+    res->wvhdl  = wvhdl;
+    for (int i=2; i<n+2; i++)
+    {
+      res->order[i]   = r->order[i-2];
+      res->block0[i]  = r->block0[i-2];
+      res->block1[i]  = r->block1[i-2];
+      res->wvhdl[i]   = r->wvhdl[i-2];
+    }
 
     // new 1st block
@@ -8360 +8370 @@
     for (int i=0; i<res->N; ++i)
       res->wvhdl[0][i]  = 1;
-    res->block1[0]  = si_min(1+res->N, rVar(res));
-
+    res->block1[0]  = si_min(res->N, rVar(res));
     // new 2nd block
     res->order[1]   = ringorder_C; // Prefix
-    res->block0[1]  = 1;
-    res->block1[1]  = res->N;
-    //res->wvhdl[j]   = NULL;
-    // res->order [j] = 0; // The End!
+    res->wvhdl[1]   = NULL;
+    // removes useless secondary component order if defined in old ring
+    for (int i=rBlocks(res); i>0; --i) {
+      if (res->order[i] == ringorder_C || res->order[i] == ringorder_c) {
+        res->order[i] = 0;
+        break;
+      }
+    }
     rComplete(res, 1);
 #ifdef HAVE_PLURAL