Changeset f6c77e9 in git for kernel/GBEngine

Timestamp:

Nov 19, 2014, 2:38:10 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

66fa7159e6605255e24cc1278b31fb5bb0e9f109

Parents:

74ec76637457a12f86e1aac1d0d62d5918e92d61

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-11-19 14:38:10+01:00

git-committer:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2014-11-19 14:38:37+01:00

Message:

fix: pLength in completeReduceFac (from master)

Location:

kernel/GBEngine

Files:

• kstdfac.cc (modified) (2 diffs)
• kutil.cc (modified) (2 diffs)
• kutil.h (modified) (2 diffs)

kernel/GBEngine/kstdfac.cc

@@ -322 +322 @@
       PrintS("-");mflush();
     }
+    int i;
+    if (strat->redTailChange)
+    {
+      for(i=strat->tl;i>=0;i--)
+      {
+        strat->initEcart(&strat->T[i]);
+      }
+    }
     ideal fac;
     ideal fac_copy;
@@ -334 +342 @@
     deleteInS(si,strat);
 
-    int i;
     for(i=IDELEMS(fac)-1;i>=0;i--)
     {

kernel/GBEngine/kutil.cc

@@ -1113 +1113 @@
 * used in mora case and if pLexOrder & sugar in bba case
 */
-void initEcartNormal (LObject* h)
+void initEcartNormal (TObject* h)
 {
   h->FDeg = h->pFDeg();
@@ -1121 +1121 @@
 }
 
-void initEcartBBA (LObject* h)
+void initEcartBBA (TObject* h)
 {
   h->FDeg = h->pFDeg();

kernel/GBEngine/kutil.h

@@ -277 +277 @@
   int (*red)(LObject * L,kStrategy strat);
   int (*red2)(LObject * L,kStrategy strat);
-  void (*initEcart)(LObject * L);
+  void (*initEcart)(TObject * L);
   int (*posInT)(const TSet T,const int tl,LObject &h);
   int (*posInLSba)(const LSet set, const int length,
@@ -507 +507 @@
 #endif
 
-void initEcartNormal (LObject* h);
-void initEcartBBA (LObject* h);
+void initEcartNormal (TObject* h);
+void initEcartBBA (TObject* h);
 void initS (ideal F, ideal Q,kStrategy strat);
 void initSL (ideal F, ideal Q,kStrategy strat);