Changeset 6e3023a in git for kernel/kspoly.cc

Timestamp:

Dec 18, 2013, 2:57:02 PM (10 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

3a9e92a717b194d4a06a429b452258c0269579076235be46a7d664256bb99b1bd6340cd8ad800e2c

Parents:

74c446222122656dc7859919b51f3806768e7fd331b00db0e867fa73d4415e16969423de4337f6f7

Message:

Merge pull request #437 from ederc/sig-comparisons

Improvements for SBA

File:

• kernel/kspoly.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
@@ -223 +223 @@
   if (!PW->is_sigsafe)
   {
-    poly f1 = p_Copy(PR->GetLmCurrRing(),currRing);
+    poly ftmp;
+    ring rtmp;
+    PR->SetLmCurrRing();
+    poly f1 = pCopy(PR->GetLmCurrRing());
+    //PR->GetLm(ftmp,rtmp);
+    //poly f1 = k_LmInit_tailRing_2_currRing(ftmp,rtmp);
     poly f2 = PW->GetLmCurrRing();
     poly sigMult = pCopy(PW->sig);   // copy signature of reducer
@@ -235 +240 @@
     printf("--------------\n");
 #endif
-    sigMult = pp_Mult_qq(f1,sigMult,currRing);
+    sigMult = p_Mult_q(f1,sigMult,currRing);
 //#if 1
 #ifdef DEBUGF5
@@ -253 +258 @@
 
 #endif
-    pDelete(&f1);
+    //pDelete(&f1);
     pDelete(&sigMult);
     // go on with the computations only if the signature of p2 is greater than the
@@ -262 +267 @@
       return 3;
     }
-    PW->is_sigsafe  = TRUE;
+    //PW->is_sigsafe  = TRUE;
   }
   PR->is_redundant = FALSE;