Changeset 22ea2e in git

Timestamp:

Nov 6, 2007, 11:40:54 AM (16 years ago)

Author:

Simon King <king@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

07625cbce35383ed00832648d9af637562d6fab5

Parents:

3685ee5dbae69b9ebe2fb2c444c9d107aa640322

Message:

weightKB: Performance improved, non-commutative bug fixed


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

File:

• Singular/LIB/standard.lib (modified) (8 diffs)

Singular/LIB/standard.lib

@@ -3 +3 @@
 //groebner mit Optionen versehen
 //////////////////////////////////////////////////////////////////////////////
-version="$Id: standard.lib,v 1.95 2007-07-25 10:02:25 Singular Exp $";
+version="$Id: standard.lib,v 1.96 2007-11-06 10:40:54 king Exp $";
 category="Miscellaneous";
 info="
@@ -1898 +1898 @@
   ideal stdtop,kbtop;
   export (stdtop,kbtop);
+  int kbsize;
+  export (kbsize);
 }
 // delete global values
@@ -1904 +1906 @@
   kill wwtop,mmtop;
   kill stdtop,kbtop;
+  kill kbsize;
 }
 //  select parts of the modul
@@ -1941 +1944 @@
   return(0);
 }
+///////////////////////////////////////////////////////
 // The "Caller" for ideals
 //    dd   - the degree of the result
@@ -1976 +1980 @@
   {
     m2=m2-wwtop[m1];
-    mo=mo*var(m1);
+    mo=var(m1)*mo;
     if(m2==0)
     {
-      if(reduce(mo,stdtop)==mo)
+      if((mo!=0) and (reduce(mo,stdtop)==mo))
       {
-        kbtop=kbtop+mo;
+        kbsize++;
+        kbtop[kbsize]=mo;
         return(kbtop);
       }
@@ -1989 +1994 @@
   return(kbtop);
 }
-// the recursive prozedur
+/////////////////////////////////////////////////////////
+// the recursive procedure
 //    va     - number of the variable
 //    drest  - rest of the degree
@@ -2006 +2012 @@
     if((m2*wwtop[1])==drest)
     {
-      mm=mm*var(1)^m2;
-      if(reduce(mm,stdtop)==mm){kbtop=kbtop+mm;}
+      mm=var(1)^m2*mm;
+      if ((mm!=0) and (reduce(mm,stdtop)==mm))
+      { kbsize++;
+        kbtop[kbsize]=mm;
+      }
     }
     return();
@@ -2016 +2025 @@
   {
     m2=m2-wwtop[va];
-    mm=mm*var(va);
+    mm=var(va)*mm;
     if(m2==0)
     {
-      if(reduce(mm,stdtop)==mm)
+      if ((mm!=0) and (reduce(mm,stdtop)==mm))
       {
-        kbtop=kbtop+mm;
+        kbsize++;
+        kbtop[kbsize]=mm;
         return();
       }