Changeset 836e389 in git

Timestamp:

Jan 9, 2009, 4:19:26 PM (14 years ago)

Author:

Motsak Oleksandr <motsak@…>

Branches:

(u'spielwiese', '91fdef05f09f54b8d58d92a472e9c4a43aa4656f')

Children:

360507e4cf4ba3531cb19770b86e6a337f9d439a

Parents:

35eef23de304e5ae3c4f51aadb5be842bb3f3c8a

Message:

*motsak:
 !: spoly works now also for Non-commutative case.
 +: product criterion check can be disabled by defining global int variable @@@NOPC=1.


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

File:

• Singular/LIB/teachstd.lib (modified) (4 diffs)

Singular/LIB/teachstd.lib

@@ -2 +2 @@
 //GMG, last modified 28.9.01
 ///////////////////////////////////////////////////////////////////////////////
-version="$Id: teachstd.lib,v 1.6 2006-07-25 12:02:44 Singular Exp $";
+version="$Id: teachstd.lib,v 1.7 2009-01-09 15:19:26 motsak Exp $";
 category="Teaching";
 info="
@@ -191 +191 @@
   int e;
   poly o = monomialLcm(f,g);
+
   if( o == 0)                    //can only happen, if vectors f and g involve
   {                              //different module components
@@ -197 +198 @@
   }
 
-  poly m=leadmonomial(f);         //compute the leading monomial as poly
-  poly n=leadmonomial(g);
+  poly m=(o/leadmonomial(f));         //compute the leading monomial as poly
+  poly n=(o/leadmonomial(g));
+  
+  f = m * f;
+  g = n * g; // now they have the same LM!  
 
   if (#[1]==0)                    //the asymmetric s-poly
   {
-    def sp = (o/m)*f - (leadcoef(f)/leadcoef(g))*(o/n)*g;
+    def sp = f - (leadcoef(f)/leadcoef(g))*g;
   }
   else                            //the symmetric s-poly, avoiding division
   {
-    def sp = leadcoef(g)*(o/m)*f - leadcoef(f)*(o/n)*g;
+    def sp = leadcoef(g)*f - leadcoef(f)*g;
   }
   return(sp);
@@ -413 +417 @@
 "
 {
+  if( defined(@@@NOPC) && (@@@NOPC == 1) )
+  {
+    return(0);
+  };
+  
   if(typeof(f)=="poly")    //product criterion for polynomials
   {