Changeset 9c115e1 in git for factory/cf_gcd_charp.cc

Timestamp:

May 7, 2010, 7:11:37 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '2a584933abf2a2d3082034c7586d38bb6de1a30a')

Children:

0d020e3d4fdcdeca020189f7662a7b5c8692382b

Parents:

88f36448cb6c1a7a2ad8cb4d70d0b24ae8faee61

Message:

pow -> ipower, code cleanup

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

File:

• factory/cf_gcd_charp.cc (modified) (8 diffs)

factory/cf_gcd_charp.cc

@@ -26 +26 @@
 #include <cf_algorithm.h>
 #include <cf_map.h>
+#include <cf_util.h>
 
 static CanonicalForm contentWRT(const CanonicalForm & F, const int lev);
@@ -232 +233 @@
   CanonicalForm result = 0;
   int i, j;
-  int fieldSize = (int) ::pow(getCharacteristic(), getGFDegree());
+  int fieldSize = ipower(getCharacteristic(), getGFDegree());
   CanonicalForm g;
   for(i = 0; i <= degree(A); i++)
@@ -353 +354 @@
   {
     k=getGFDegree();
-    fieldSize = (int) ::pow(p, k);
+    fieldSize = ipower(p, k);
   }
 
@@ -361 +362 @@
   //  cout << "k: " << k << endl;
   //  cout << "fieldSize: " << fieldSize << endl;
-  //  cout << "pow: " << pow(p, k) << endl;
+  //  cout << "pow: " << ipower(p, k) << endl;
   //}
   
@@ -510 +511 @@
       }
       int expon = 2; // expon <= will not extend the field
-      while(::pow(fieldSize, expon) < degMax)
+      while(ipower(fieldSize, expon) < degMax)
       {
         expon++;
@@ -517 +518 @@
       if(k > 1)
       {
-        if(::pow(p,k * expon) < (1<<16))
+        if(ipower(p,k * expon) < (1<<16))
         {
           setCharacteristic(p, k * expon, 'b');
@@ -541 +542 @@
       else
       {
-        if(::pow(p,k * expon) < (1<<16))
+        if(ipower(p,k * expon) < (1<<16))
         {
           setCharacteristic(p, k * expon, 'a');
@@ -627 +628 @@
   int k = getGFDegree();
   int p = getCharacteristic();
-  int fieldSize = pow(p, k);
+  int fieldSize = ipower(p, k);
   cout << "p: " << p << endl;
   cout << "GFDegree: " << k << endl;