Changeset 6a70f3 in git for kernel/GBEngine/kstd2.cc

Timestamp:

Dec 9, 2014, 4:09:48 PM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

56d8843ea10b1914d8654dce77191eb32927691a

Parents:

fb12237b139e55d2a8d2f4de2ccf1267e1f976cd

Message:

use standard names: int_number -> mpz_prt, NATNUMBER ->unsigned long

File:

• kernel/GBEngine/kstd2.cc (modified) (6 diffs)

kernel/GBEngine/kstd2.cc

@@ -216 +216 @@
   poly p = input_p;
   poly zeroPoly = NULL;
-  NATNUMBER a = (NATNUMBER) pGetCoeff(p);
+  unsigned long a = (unsigned long) pGetCoeff(p);
 
   int k_ind2 = 0;
   int a_ind2 = ind2(a);
 
-  // NATNUMBER k = 1;
+  // unsigned long k = 1;
   // of interest is only k_ind2, special routine for improvement ... TODO OLIVER
   for (int i = 1; i <= leadRing->N; i++)
@@ -228 +228 @@
   }
 
-  a = (NATNUMBER) pGetCoeff(p);
+  a = (unsigned long) pGetCoeff(p);
 
   number tmp1;
@@ -251 +251 @@
       }
       p_SetExp(lead_mult, i, p_GetExp(p, i,leadRing) - s_exp, tailRing);
-      for (NATNUMBER j = 1; j <= s_exp; j++)
+      for (unsigned long j = 1; j <= s_exp; j++)
       {
         tmp1 = nInit(j);
@@ -280 +280 @@
     return tmp2;
   }
-/*  NATNUMBER alpha_k = twoPow(leadRing->ch - k_ind2);
+/*  unsigned long alpha_k = twoPow(leadRing->ch - k_ind2);
   if (1 == 0 && alpha_k <= a)
   {  // Temporarly disabled, reducing coefficients not compatible with std TODO Oliver
@@ -286 +286 @@
     for (int i = 1; i <= leadRing->N; i++)
     {
-      for (NATNUMBER j = 1; j <= p_GetExp(p, i, leadRing); j++)
+      for (unsigned long j = 1; j <= p_GetExp(p, i, leadRing); j++)
       {
         tmp1 = nInit(j);
@@ -298 +298 @@
         else
         {
-          tmp3 = p_ISet((NATNUMBER) tmp1, tailRing);
+          tmp3 = p_ISet((unsigned long) tmp1, tailRing);
           zeroPoly = p_Mult_q(zeroPoly, p_Add_q(tmp2, tmp3, tailRing), tailRing);
         }
       }
     }
-    tmp2 = p_ISet((NATNUMBER) pGetCoeff(zeroPoly), leadRing);
+    tmp2 = p_ISet((unsigned long) pGetCoeff(zeroPoly), leadRing);
     for (int i = 1; i <= leadRing->N; i++)
     {