Changeset 1eba39 in git

Timestamp:

Dec 11, 2013, 6:22:21 PM (9 years ago)

Author:

Christian Eder

Branches:

(u'jengelh-datetime', 'ceac47cbc86fe4a15902392bdbb9bd2ae0ea02c6')(u'spielwiese', 'f875bbaccd0831e36aaed09ff6adeb3eb45aeb94')

Children:

cc6544e8240b1641c06b4c0ef07a1d4cc428a0b7

Parents:

d5856fbe65f58da80d3a39417a5314d658f97342

git-author:

Christian Eder <ederc@mathematik.uni-kl.de>2013-12-11 18:22:21+01:00

git-committer:

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

Message:

partly fixes memory generation for degree-index-lt order

Location:

kernel

Files:

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

kernel/kstd2.cc

@@ -2128 +2128 @@
           Q.sig = p_One(currRing);
           p_SetExpV(Q.sig, vv, currRing);
+          // F->m[i-1] corresponds to index i
+          p_ExpVectorAdd(Q.sig,F->m[i-1],currRing);
           p_SetComp(Q.sig, i, currRing);
           pos = posInSyz(strat, Q.sig);
@@ -2133 +2135 @@
         }
       }
-//#if 1
-#if DEBUGF50
+#if 1
+//#if DEBUGF50
     printf("---------------------------\n");
     Print(" %d. ELEMENT ADDED TO GCURR:\n",strat->sl+1);
@@ -2182 +2184 @@
         int pos = posInSyz(strat, strat->P.sig);
         enterSyz(strat->P, strat, pos);
-//#if 1
-#ifdef DEBUGF5
+#if 1
+//#ifdef DEBUGF5
         Print("ADDING STUFF TO SYZ :  ");
-        pWrite(strat->P.p);
+        //pWrite(strat->P.p);
         pWrite(strat->P.sig);
 #endif

kernel/kutil.cc

@@ -6010 +6010 @@
       // => we can keep the underlying monomial order and get a Schreyer
       //    order without any bigger overhead
-      if (strat->sbaOrder == 0)
+      if (strat->sbaOrder == 0 || strat->sbaOrder == 3)
       {
         p_ExpVectorAdd (h.sig,F->m[i],currRing);