Changeset f7f084 in git

Timestamp:

Nov 28, 2013, 8:16:24 PM (10 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', 'd1b01e9d51ade4b46b745d3bada5c5f3696be3a8')

Children:

f397dc928c632a2acc5076b2121dcedf217f5494

Parents:

faa12b153d136fe6d92324f9d140a98f250566f5

git-author:

Christian Eder <ederc@mathematik.uni-kl.de>2013-11-28 20:16:24+01:00

git-committer:

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

Message:

changes incremental flag to sbaOrder, no longer BOOLEAN
=> preparation in order to introduce more module orders for sba

Location:

kernel

Files:

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

kernel/kstd1.cc

@@ -1422 +1422 @@
   // standard basis computations
   strat->red          = redSig;
-  //strat->incremental  = TRUE;
+  //strat->sbaOrder  = 1;
   strat->currIdx      = 1;
 }
@@ -2253 +2253 @@
 }
 
-ideal kSba(ideal F, ideal Q, tHomog h,intvec ** w, int incremental, int arri, intvec *hilb,int syzComp,
+ideal kSba(ideal F, ideal Q, tHomog h,intvec ** w, int sbaOrder, int arri, intvec *hilb,int syzComp,
           int newIdeal, intvec *vw)
 {
@@ -2263 +2263 @@
   BOOLEAN delete_w=(w==NULL);
   kStrategy strat=new skStrategy;
-  if (incremental!=0)
-  {
-    strat->incremental = TRUE;
-  }
-  else
-  {
-    strat->incremental = FALSE;
-  }
+  strat->sbaOrder = sbaOrder;
   if (arri!=0)
   {

kernel/kstd2.cc

@@ -63 +63 @@
 
 // counts sba's reduction steps
-#if SBA_PRNT_REDUCTION_STEPS
+#if SBA_PRINT_REDUCTION_STEPS
 long sba_reduction_steps;
 long sba_interreduction_steps;
@@ -1675 +1675 @@
   //    induced Schreyer order.
   // The corresponding orders are computed in sbaRing(), depending
-  // on the flag strat->incremental
+  // on the flag strat->sbaOrder
 #if SBA_PRINT_ZERO_REDUCTIONS
   long zeroreductions           = 0;
@@ -1701 +1701 @@
   ring sRing, currRingOld;
   currRingOld  = currRing;
-  if (strat->incremental)
+  if (strat->sbaOrder == 1)
   {
     sRing = sbaRing(strat);
@@ -1804 +1804 @@
       else strat->noClearS=TRUE;
     }
-    if (strat->incremental && pGetComp(strat->L[strat->Ll].sig) != strat->currIdx)
+    if (strat->sbaOrder == 1 && pGetComp(strat->L[strat->Ll].sig) != strat->currIdx)
     {
       strat->currIdx  = pGetComp(strat->L[strat->Ll].sig);
@@ -1969 +1969 @@
     // remove sigsafe label since it is no longer valid for the next element to
     // be reduced
-    if (strat->incremental)
+    if (strat->sbaOrder == 1)
     {
       for (int jj = 0; jj<strat->tl+1; jj++)
@@ -2017 +2017 @@
       // enter into S, L, and T
       //if ((!TEST_OPT_IDLIFT) || (pGetComp(strat->P.p) <= strat->syzComp))
-      if(!strat->incremental)
+      if(!strat->sbaOrder == 1)
       {
         BOOLEAN overwrite = TRUE;
@@ -2229 +2229 @@
   }
 #endif
-  if (strat->incremental && sRing!=currRingOld)
+  if (strat->sbaOrder == 1 && sRing!=currRingOld)
   {
     rChangeCurrRing (currRingOld);

kernel/kutil.cc

@@ -5937 +5937 @@
   strat->S      =   strat->Shdl->m;
   strat->sig    =   (poly *)omAlloc0(i*sizeof(poly));
-  if (!strat->incremental)
+  if (strat->sbaOrder != 1)
   {
     strat->syz    = (poly *)omAlloc0(i*sizeof(poly));
@@ -5999 +5999 @@
       // => we can keep the underlying monomial order and get a Schreyer
       //    order without any bigger overhead
-      if (!strat->incremental)
+      if (strat->sbaOrder != 1)
       {
         p_ExpVectorAdd (h.sig,F->m[i],currRing);
@@ -6036 +6036 @@
       }
       /*
-      if (!strat->incremental)
+      if (strat->sbaOrder != 1)
       {
         for(j=0;j<i;j++)
@@ -7341 +7341 @@
    *****************************************/
   //strat->rewCrit1     = faugereRewCriterion;
-  if (strat->incremental)
+  if (strat->sbaOrder == 1)
   {
     strat->syzCrit  = syzCriterionInc;
@@ -7765 +7765 @@
   omFreeSize((ADDRESS)strat->syz,(strat->syzmax)*sizeof(poly));
   omFreeSize((ADDRESS)strat->sevSyz,(strat->syzmax)*sizeof(unsigned long));
-  if (strat->incremental)
+  if (strat->sbaOrder == 1)
   {
     omFreeSize(strat->syzIdx,(strat->syzidxmax)*sizeof(int));
@@ -8254 +8254 @@
 {
   int n = rBlocks(r); // Including trailing zero!
-  // if incremental => use (C,monomial order from r)
-  if (strat->incremental)
+  // if sbaOrder == 1 => use (C,monomial order from r)
+  if (strat->sbaOrder == 1)
   {
     if (r->order[0] == ringorder_C || r->order[0] == ringorder_c)
@@ -8298 +8298 @@
   }
 
-  // not incremental => use Schreyer order
+  // not sbaOrder == 1 => use Schreyer order
   // this is done by a trick when initializing the signatures
   // in initSLSba():

kernel/kutil.h

@@ -310 +310 @@
                 // syzygy of component i comes up
                 // important for signature-based algorithms
-  BOOLEAN incremental;
+  unsigned sbaOrder;
   unsigned long currIdx;
   int max_lower_index;