Changeset a7b37d in git

Timestamp:

Nov 30, 2013, 5:58:57 PM (10 years ago)

Author:

Christian Eder

Branches:

(u'spielwiese', '17f1d200f27c5bd38f5dfc6e8a0879242279d1d8')

Children:

8fcfae8f6c0ccad3ba1e0ef4c47af7a29c2a14a1

Parents:

1179b54c4bb1091a4f7935b8f70b688f002f7f1c

git-author:

Christian Eder <ederc@mathematik.uni-kl.de>2013-11-30 17:58:57+01:00

git-committer:

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

Message:

1. some more memory leaks fixed
2. preparation for buchber product criterion check

Location:

kernel

Files:

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

kernel/kstd2.cc

@@ -1899 +1899 @@
       if (!strat->rewCrit2(strat->P.sig, ~strat->P.sevSig, strat, strat->P.checked+1)) {
 #if SBA_PRODUCT_CRITERION
-        if (strat->P.checked == 3) {
+        if (strat->P.prd_crit) {
           product_criterion++;
           enterSyz(strat->P, strat);
@@ -1912 +1912 @@
 #endif
       } else {
+        pDelete(&strat->P.sig);
         if (strat->P.lcm!=NULL)
           pLmFree(strat->P.lcm);

kernel/kutil.cc

@@ -1892 +1892 @@
 // adds buchberger's first criterion
   if (pLmCmp(m2,pHead(p)) == 0) {
-    Lp.checked  = 3; // 3 == Product Criterion
+    Lp.prod_crit = TRUE; // Product Criterion
 #if 0
     enterSyz(Lp, strat);
@@ -5225 +5225 @@
     if (strat->L[strat->Ll].GetLmCurrRing() == NULL)
     {
+      pDelete(&strat->P.sig);
       strat->P.Delete();
       strat->P = strat->L[strat->Ll];
@@ -5239 +5240 @@
       else
       {
+        pDelete(&strat->P.sig);
         strat->P.Delete();
         strat->P = strat->L[strat->Ll];

kernel/kutil.h

@@ -188 +188 @@
                       // reduction process it is enough to start a second
                       // rewritten criterion check from checked+1 onwards
-                      // NOTE: If checked = 3 then the corresponding pair is
+  BOOLEAN prod_crit;
+                      // NOTE: If prod_crit = TRUE then the corresponding pair is
                       // detected by Buchberger's Product Criterion and can be
                       // deleted