Changeset 241f58 in git

Timestamp:

Mar 14, 2001, 4:51:53 PM (22 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

4e18c51925ab32021341e7172545db0b399b0eab

Parents:

7bd107102e136678c7798894c6d866b2b4d30d3f

Message:

*hannes: posInS, hLexS


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

Location:

Singular

Files:

• hilb.cc (modified) (2 diffs)
• hutil.cc (modified) (10 diffs)
• kutil.cc (modified) (2 diffs)

Singular/hilb.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: hilb.cc,v 1.18 2000-12-14 16:38:48 obachman Exp $ */
+/* $Id: hilb.cc,v 1.19 2001-03-14 15:51:53 Singular Exp $ */
 /*
 *  ABSTRACT -  Hilbert series
@@ -264 +264 @@
       for (i = hNvar; i; i--)
         hvar[i] = i;
-      if (notstc)
+      //if (notstc) // TODO: no mon divedes another
         hStaircase(hstc, &hNstc, hvar, hNvar);
       hSupp(hstc, hNstc, hvar, &hNvar);

Singular/hutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: hutil.cc,v 1.18 2000-11-08 15:34:55 obachman Exp $ */
+/* $Id: hutil.cc,v 1.19 2001-03-14 15:51:52 Singular Exp $ */
 /*
 * ABSTRACT: Utilities for staircase operations
@@ -289 +289 @@
 static void hShrink(scfmon co, int a, int Nco)
 {
-  int  i = a, j = a;
-  for (; j < Nco; j++)
-  {
-    if (co[j])
+  while ((co[a]!=NULL) && (a<Nco)) a++;
+  int i = a;
+  int j;
+  for (j = a; j < Nco; j++)
+  {
+    if (co[j]!=NULL)
     {
       co[i] = co[j];
@@ -303 +305 @@
 void hStaircase(scfmon stc, int *Nstc, varset var, int Nvar)
 {
-  int  nc = *Nstc, z = 0, i, j, k, k1;
-  scmon n, o;
+  int  nc = *Nstc;
   if (nc < 2)
     return;
-  i = 0;
-  j = 1;
-  n = stc[j];
-  o = *stc;
-  k = Nvar;
+  int z = 0;
+  int i = 0;
+  int j = 1;
+  scmon n = stc[1 /*j*/];
+  scmon o = stc[0];
+  int k = Nvar;
   loop
   {
-    k1 = var[k];
+    int k1 = var[k];
     if (o[k1] > n[k1])
     {
@@ -320 +322 @@
       {
         k--;
-        if (!k)
+        if (k==0)
         {
           stc[i] = NULL;
@@ -340 +342 @@
       {
         k--;
-        if (!k)
+        if (k==0)
         {
           stc[j] = NULL;
@@ -358 +360 @@
     {
       k--;
-      if (!k)
+      if (k==0)
       {
         stc[j] = NULL;
@@ -367 +369 @@
     if (k == Nvar)
     {
-      if (!stc[j])
+      if (stc[j]==NULL)
         i = j - 1;
       loop
@@ -380 +382 @@
           else
           {
-            if (z)
+            if (z!=0)
             {
               *Nstc -= z;
@@ -388 +390 @@
           }
         }
-        else if (stc[i])
+        else if (stc[i]!=NULL)
         {
           o = stc[i];
@@ -545 +547 @@
     }
     else
+    {
       k--;
+    }
   }
 }

Singular/kutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kutil.cc,v 1.98 2001-03-08 13:05:13 Singular Exp $ */
+/* $Id: kutil.cc,v 1.99 2001-03-14 15:51:53 Singular Exp $ */
 /*
 * ABSTRACT: kernel: utils for kStd
@@ -1682 +1682 @@
         if (pLmCmp(set[an],p) == -cmp_int) return en;
         if ((cmp_int!=1)
-        && ((strat->ecartS[an])<ecart_p))
+        && ((strat->ecartS[an])>ecart_p))
           return an;
         return en;