Changeset 5563ba in git

Timestamp:

Jan 15, 2009, 6:03:19 PM (14 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

610069760287bbabd869a3157cc5fffd486ca6a3

Parents:

4820e6031f295812abcdff3a062f9f1b9334cbec

Message:

*hannes: scKbase with module weights


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

Location:

kernel

Files:

• hdegree.cc (modified) (3 diffs)
• stairc.h (modified) (2 diffs)

kernel/hdegree.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: hdegree.cc,v 1.10 2007-11-09 12:50:44 Singular Exp $ */
+/* $Id: hdegree.cc,v 1.11 2009-01-15 17:03:19 Singular Exp $ */
 /*
 *  ABSTRACT -  dimension, multiplicity, HC, kbase
@@ -1296 +1296 @@
 }
 
-ideal scKBase(int deg, ideal s, ideal Q)
+ideal scKBase(int deg, ideal s, ideal Q, intvec * mv)
 {
   int  i, di;
@@ -1333 +1333 @@
       *act = i;
       hComp(hexist, hNexist, i, hstc, &hNstc);
-      if (hNstc)
-      {
-        if (deg < 0) scInKbase(hstc, hNstc, pVariables);
-        else scDegKbase(hstc, hNstc, pVariables, deg);
-      }
-      else
-        scAll(pVariables, deg);
+      int deg_ei=deg;
+      if (mv!=NULL) deg_ei -= (*mv)[i-1];
+      if ((deg < 0) || (deg_ei>=0))
+      {
+        if (hNstc)
+        {
+          if (deg < 0) scInKbase(hstc, hNstc, pVariables);
+          else scDegKbase(hstc, hNstc, pVariables, deg_ei);
+        }
+        else
+          scAll(pVariables, deg_ei);
+      }
     }
     omFreeSize((ADDRESS)hstc, hNexist * sizeof(scmon));

kernel/stairc.h

@@ -4 +4 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: stairc.h,v 1.5 2007-11-09 12:50:44 Singular Exp $ */
+/* $Id: stairc.h,v 1.6 2009-01-15 17:03:19 Singular Exp $ */
 /*
 * ABSTRACT
@@ -24 +24 @@
 void scDegree(ideal  s,intvec *modulweight,ideal Q=NULL);
 
-ideal scKBase(int deg, ideal  s, ideal Q=NULL);
+ideal scKBase(int deg, ideal  s, ideal Q=NULL, intvec * mv=NULL);
 
 intvec * hHstdSeries(ideal S, intvec *modulweight, intvec *wdegree,