Changeset d11734 in git

Timestamp:

Dec 12, 2013, 3:50:39 PM (10 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

c4279b7c056a41721f90960da06be24e4b9ed6b4

Parents:

cc6544e8240b1641c06b4c0ef07a1d4cc428a0b7

Message:

adds new ring order conversion in sba:
usage of degree - index - ringOrder now possible

Location:

kernel

Files:

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

kernel/kstd2.cc

@@ -1702 +1702 @@
   ring sRing, currRingOld;
   currRingOld  = currRing;
-  if (strat->sbaOrder == 1)
+  if (strat->sbaOrder == 1 || strat->sbaOrder == 3)
   {
     sRing = sbaRing(strat);
@@ -2318 +2318 @@
   }
 #endif
-  if (strat->sbaOrder == 1 && sRing!=currRingOld)
+  if ((strat->sbaOrder == 1 || strat->sbaOrder == 3) && sRing!=currRingOld)
   {
     rChangeCurrRing (currRingOld);

kernel/kutil.cc

@@ -8314 +8314 @@
     // 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!
+    rComplete(res, 1);
+#ifdef HAVE_PLURAL
+    if (rIsPluralRing(r))
+    {
+      if ( nc_rComplete(r, res, false) ) // no qideal!
+      {
+#ifndef NDEBUG
+        WarnS("error in nc_rComplete");
+#endif
+        // cleanup?
+
+        //      rDelete(res);
+        //      return r;
+
+        // just go on..
+      }
+    }
+#endif
+    strat->tailRing = res;
+    return (res);
+  }
+  // if sbaOrder == 3 => degree - position - ring order
+  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");
+
+    // new 1st block
+    res->order[0]   = ringorder_a; // Prefix
     res->block0[0]  = 1;
-    res->block1[0]  = res->N;
+    res->wvhdl[0]   = (int *)omAlloc(res->N*sizeof(int));
+    for (int i=0; i<res->N; ++i)
+      res->wvhdl[0][i]  = 1;
+    res->block1[0]  = si_min(1+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!