Changeset cf218e8 in git

Timestamp:

Apr 10, 2009, 9:01:11 PM (14 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

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

Children:

8b09ef24947688a333cfa1d2bd4db6970e7bb313

Parents:

8d9e0d2856a0d53fb3cce0dd24b0390dd4f9f065

Message:

*motsak: Lie bracket instead of S-poly for Lie-algebras due to Viktor


git-svn-id: file:///usr/local/Singular/svn/trunk@11677 2c84dea3-7e68-4137-9b89-c4e89433aadc

File:

• kernel/kutil.cc (modified) (4 diffs)

kernel/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.133 2009-04-08 17:32:57 motsak Exp $ */
+/* $Id: kutil.cc,v 1.134 2009-04-10 19:01:11 motsak Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -1542 +1542 @@
       if(pHasNotCF(p, strat->S[i]))
       {
-//         if(ncRingType(currRing) == nc_lie)
-//         {
-//             // generalized prod-crit for lie-type
-//             strat->cp++;
-//             Lp.p = nc_p_Bracket_qq(pCopy(p),strat->S[i]);
-//         }
-//         else
+         if(ncRingType(currRing) == nc_lie)
+         {
+             // generalized prod-crit for lie-type
+             strat->cp++;
+             Lp.p = nc_p_Bracket_qq(pCopy(p),strat->S[i]);
+         }
+         else
         if( ALLOW_PROD_CRIT(strat) )
         {
@@ -1556 +1556 @@
         }
         else
+        {
           Lp.p = // nc_CreateSpoly(strat->S[i],p,currRing); 
-                 nc_CreateShortSpoly(strat->S[i], p, currRing); 
+                nc_CreateShortSpoly(strat->S[i], p, currRing);
+
+          assume(pNext(Lp.p)==NULL); // TODO: this may be violated whenever ext.prod.crit. for Lie alg. is used    
+          pNext(Lp.p) = strat->tail; // !!!
+        }
       }
       else
+      {
         Lp.p = // nc_CreateSpoly(strat->S[i],p,currRing); 
-                nc_CreateShortSpoly(strat->S[i], p, currRing); 
+              nc_CreateShortSpoly(strat->S[i], p, currRing);
+
+        assume(pNext(Lp.p)==NULL); // TODO: this may be violated whenever ext.prod.crit. for Lie alg. is used    
+        pNext(Lp.p) = strat->tail; // !!!
+
+      }
 
       
@@ -1614 +1625 @@
     Lp.p2 = p;
 
-//    if ( !rIsPluralRing(currRing) ) // !!!!
-    assume(pNext(Lp.p)==NULL);
-    pNext(Lp.p) = strat->tail; // !!!
+    if (
+        (!rIsPluralRing(currRing))
+//      ||  (rIsPluralRing(currRing) && (ncRingType(currRing) != nc_lie))         
+       )
+    {
+      assume(pNext(Lp.p)==NULL); // TODO: this may be violated whenever ext.prod.crit. for Lie alg. is used    
+      pNext(Lp.p) = strat->tail; // !!!
+    }
 
     if (atR >= 0)