Changeset f9326d2 in git

Timestamp:

Sep 4, 1997, 9:31:57 AM (26 years ago)

Author:

Wilfred Pohl <pohl@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

72dd6eeaebf0db2fe0f6bd43bfe99cedfbcf38e3

Parents:

9a7a66619e0df89480e6c5daec5c873e32ef749d

Message:

new order for variables: hOrdSupp


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

File:

• Singular/hutil.cc (modified) (6 diffs)

Singular/hutil.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: hutil.cc,v 1.3 1997-04-02 15:07:03 Singular Exp $ */
+/* $Id: hutil.cc,v 1.4 1997-09-04 07:31:57 pohl Exp $ */
 /*
 * ABSTRACT: Utilities for staircase operations
@@ -143 +143 @@
 }
 
-
 void hOrdSupp(scfmon stc, int Nstc, varset var, int Nvar)
 {
   int  i, i1, j, jj, k, l;
   short  x;
-  scmon temp;
-  varset v1;
-  v1 = (int *)Alloc(Nvar * sizeof(int));
+  scmon temp, count;
+  float o, h, g, *v1;
+
+  v1 = (float *)Alloc(Nvar * sizeof(float));
   temp = (short *)Alloc(Nstc * sizeof(short));
+  count = (short *)Alloc(Nstc * sizeof(short));
   for (i = 1; i <= Nvar; i++)
   {
     i1 = var[i];
     *temp = stc[0][i1];
+    *count = 1;
     jj = 1;
     for (j = 1; j < Nstc; j++)
@@ -169 +171 @@
           {
             temp[k] = x;
+            count[k] = 1;
             jj++;
             break;
@@ -175 +178 @@
         else if (x < temp[k])
         {
-          for (l = jj; l < k; l--)
+          for (l = jj; l > k; l--)
+          {
             temp[l] = temp[l-1];
+            count[l] = count[l-1];
+          }
           temp[k] = x;
+          count[k] = 1;
           jj++;
           break;
         }
         else
-          break;
-      }
-    }
-    jj *= 2;
-    if (!(*temp))
-      jj--;
-    v1[i-1] = jj;
-  }
+        {
+          count[k]++;
+          break;
+        }
+      }
+    }
+    h = 0.0;
+    o = (float)Nstc/(float)jj;
+    for(j = 0; j < jj; j++)
+    {
+       g = (float)count[j];
+       if (g > o)
+         g -= o;
+       else
+         g = o - g;
+       if (g > h)
+         h = g;
+    }
+    v1[i-1] = h * (float)jj;
+  }
+  Free((ADDRESS)count, Nstc * sizeof(short));
+  Free((ADDRESS)temp, Nstc * sizeof(short));
   for (i = 1; i < Nvar; i++)
   {
     i1 = var[i+1];
-    jj = v1[i];
+    h = v1[i];
     j = 0;
     loop
     {
-      if (jj > v1[j])
+      if (h > v1[j])
       {
         for (l = i; l > j; l--)
@@ -204 +225 @@
           var[l+1] = var[l];
         }
-        v1[j] = jj;
+        v1[j] = h;
         var[j+1] = i1;
         break;
@@ -213 +234 @@
     }
   }
-  Free((ADDRESS)temp, Nstc * sizeof(short));
-  Free((ADDRESS)v1, Nvar * sizeof(int));
+  Free((ADDRESS)v1, Nvar * sizeof(float));
 }