Changeset 994445 in git for kernel/kstd2.cc

Timestamp:

May 3, 2007, 3:50:10 PM (17 years ago)

Author:

Oliver Wienand <wienand@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

bf64c41bd9346d70ecaaab3ee59f58f5d9d766e8

Parents:

68f702755adfca2ca864e4c2c157ecd0db64cea8

Message:

Neuer Koeffizientenbereich Z/n
Neuer Makrodatentyp NATNUMBER = unsigned long
Bisschen aufgeraeumt


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

File:

• kernel/kstd2.cc (modified) (8 diffs)

kernel/kstd2.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id: kstd2.cc,v 1.41 2007-03-29 11:41:11 Singular Exp $ */
+/* $Id: kstd2.cc,v 1.42 2007-05-03 13:50:08 wienand Exp $ */
 /*
 *  ABSTRACT -  Kernel: alg. of Buchberger
@@ -188 +188 @@
 */
 
-long factorial(long arg)
-{
-   long tmp = 1; arg++;
+NATNUMBER factorial(NATNUMBER arg)
+{
+   NATNUMBER tmp = 1; arg++;
    for (int i = 2; i < arg; i++)
    {
@@ -206 +206 @@
   poly p = input_p;
   poly zeroPoly = NULL;
-  long a = (long) pGetCoeff(p);
+  NATNUMBER a = (NATNUMBER) pGetCoeff(p);
 
   int k_ind2 = 0;
   int a_ind2 = ind2(a);
 
-  long k = 1;
+  NATNUMBER k = 1;
   // of interest is only k_ind2, special routine for improvement ... TODO OLIVER
   for (int i = 1; i <= leadRing->N; i++)
@@ -218 +218 @@
   }
 
-  a = (long) pGetCoeff(p);
+  a = (NATNUMBER) pGetCoeff(p);
 
   number tmp1;
@@ -241 +241 @@
       }
       p_SetExp(lead_mult, i, p_GetExp(p, i,leadRing) - s_exp, tailRing);
-      for (long j = 1; j <= s_exp; j++)
+      for (NATNUMBER j = 1; j <= s_exp; j++)
       {
         tmp1 = nInit(j);
@@ -270 +270 @@
     return tmp2;
   }
-/*  long alpha_k = twoPow(leadRing->ch - k_ind2);
+/*  NATNUMBER alpha_k = twoPow(leadRing->ch - k_ind2);
   if (1 == 0 && alpha_k <= a)
   {  // Temporarly disabled, reducing coefficients not compatible with std TODO Oliver
@@ -276 +276 @@
     for (int i = 1; i <= leadRing->N; i++)
     {
-      for (long j = 1; j <= p_GetExp(p, i, leadRing); j++)
+      for (NATNUMBER j = 1; j <= p_GetExp(p, i, leadRing); j++)
       {
         tmp1 = nInit(j);
@@ -288 +288 @@
         else
         {
-          tmp3 = p_ISet((long) tmp1, tailRing);
+          tmp3 = p_ISet((NATNUMBER) tmp1, tailRing);
           zeroPoly = p_Mult_q(zeroPoly, p_Add_q(tmp2, tmp3, tailRing), tailRing);
         }
       }
     }
-    tmp2 = p_ISet((long) pGetCoeff(zeroPoly), leadRing);
+    tmp2 = p_ISet((NATNUMBER) pGetCoeff(zeroPoly), leadRing);
     for (int i = 1; i <= leadRing->N; i++)
     {