Changeset 493cf3d in git

Timestamp:

Nov 29, 2013, 3:48:37 PM (10 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

2b691ca17a06c424cb7ee82c9d8dddbb88cc51cc

Parents:

be300e72dd08e74a482eee2b4526085e1e8c45f5

git-author:

Christian Eder <ederc@mathematik.uni-kl.de>2013-11-29 15:48:37+01:00

git-committer:

Christian Eder <ederc@mathematik.uni-kl.de>2013-12-12 13:51:27+01:00

Message:

fixes signature computation in TOP for sba

Location:

kernel

Files:

• kspoly.cc (modified) (2 diffs)
• kstd2.cc (modified) (6 diffs)

kernel/kspoly.cc

@@ -201 +201 @@
    * TODO:
    * --------------------------------------------
-   * if strat->incremental
+   * if strat->sbaOrder == 1
    * Since we are subdividing lower index and
    * current index reductions it is enough to
@@ -207 +207 @@
    * for a check. This should speed-up checking
    * a lot!
-   * if !strat->incremental
+   * if !strat->sbaOrder == 0
    * We are not subdividing lower and current index
    * due to the fact that we are using the induced

kernel/kstd2.cc

@@ -55 +55 @@
 #define SBA_TAIL_RED                        1
 #define SBA_PRODUCT_CRITERION               0
-#define SBA_PRINT_ZERO_REDUCTIONS           0
-#define SBA_PRINT_REDUCTION_STEPS           0
-#define SBA_PRINT_OPERATIONS                0
-#define SBA_PRINT_SIZE_G                    0
-#define SBA_PRINT_SIZE_SYZ                  0
+#define SBA_PRINT_ZERO_REDUCTIONS           1
+#define SBA_PRINT_REDUCTION_STEPS           1
+#define SBA_PRINT_OPERATIONS                1
+#define SBA_PRINT_SIZE_G                    1
+#define SBA_PRINT_SIZE_SYZ                  1
 #define SBA_PRINT_PRODUCT_CRITERION         0
 
@@ -1698 +1698 @@
 #endif
 
-  ideal F = F0;
+  ideal F1 = F0;
   ring sRing, currRingOld;
   currRingOld  = currRing;
@@ -1707 +1707 @@
     {
       rChangeCurrRing (sRing);
-      F = idrMoveR (F0, currRingOld, currRing);
-    }
-  }
+      F1 = idrMoveR (F0, currRingOld, currRing);
+    }
+  }
+  // sort ideal F
+  ideal F       = idInit(IDELEMS(F1),F1->rank);
+  intvec *sort  = idSort(F1);
+  for (int i=0; i<sort->length();++i)
+    F->m[i] = F1->m[(*sort)[i]-1];
 #if 0
   printf("SBA COMPUTATIONS DONE IN THE FOLLOWING RING:\n");
@@ -1888 +1893 @@
 #ifdef DEBUGF5
       Print("Poly before red: ");
-      pWrite(strat->P.p);
+      pWrite(pHead(strat->P.p));
+      pWrite(strat->P.sig);
 #endif
       /* reduction of the element choosen from L */
@@ -2017 +2023 @@
       // enter into S, L, and T
       //if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp))
-      if(strat->sbaOrder != 1)
+      if(strat->sbaOrder == 0)
       {
         BOOLEAN overwrite = TRUE;
@@ -2233 +2239 @@
   {
     rChangeCurrRing (currRingOld);
-    F0          = idrMoveR (F, sRing, currRing);
+    F0          = idrMoveR (F1, sRing, currRing);
     strat->Shdl = idrMoveR_NoSort (strat->Shdl, sRing, currRing);
     rDelete (sRing);