Changeset a62201 in git

Timestamp:

Jul 22, 2014, 9:37:16 AM (9 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'a7324b6e0b44a1a8ed3fa4d9ca3e2ff210ddd52c')

Children:

0c42a847c2651462997b32adb623b79f38d133f5

Parents:

638c230a7830a70d265a617a0f2f2fa0505f2ec0

Message:

add: ndPower by Claus Fieker

File:

• libpolys/coeffs/numbers.cc (modified) (24 diffs)

libpolys/coeffs/numbers.cc

@@ -69 +69 @@
 }
 
+void ndPower(number a, int i, number * res, const coeffs r)
+{
+  if (i==0) {
+    *res = n_Init(1, r);
+  } else if (i==1) {
+    *res = n_Copy(a, r);
+  } else if (i==2) {
+    *res = n_Mult(a, a, r);
+  } else if (i<0) {
+    number b = n_Invers(a, r);
+    ndPower(b, -i, res, r);
+    n_Delete(&b, r);
+  } else {
+    ndPower(a, i/2, res, r);
+    n_InpMult(*res, *res, r);
+    if (i&1) {
+      n_InpMult(*res, a, r);
+    }
+  }
+}
 #ifdef LDEBUG
 void   nDBDummy1(number* d,char *, int) { *d=NULL; }
@@ -85 +105 @@
 {
   Werror("ChineseRemainder not implemented for %s (c=%d)",r->cfCoeffString(r),getCoeffType(r));
-  return n_Init(0,r); 
+  return n_Init(0,r);
 }
 
@@ -105 +125 @@
   if( (c != 0) && !ret )
   {
-    number ch = n_Init( c, r ); 
+    number ch = n_Init( c, r );
     number g = n_Gcd( ch, a, r );
     ret = !n_IsOne (g, r);
@@ -111 +131 @@
     n_Delete(&g, r);
   }
-  return ret; 
+  return ret;
 }
 
@@ -143 +163 @@
     c = n_Init(1, r);
     return;
-  }  
+  }
 
   number &curr = numberCollectionEnumerator.Current();
-  
+
 #ifdef HAVE_RINGS
-  /// TODO: move to a separate implementation 
+  /// TODO: move to a separate implementation
   if (nCoeff_is_Ring(r))
   {
@@ -154 +174 @@
     {
       c = n_GetUnit(curr, r);
-      
+
       if (!n_IsOne(c, r))
       {
@@ -160 +180 @@
 
         n_InpMult(curr, inv, r);
-        
+
         while( numberCollectionEnumerator.MoveNext() )
         {
@@ -168 +188 @@
         }
 
-        n_Delete(&inv, r);        
-      }      
+        n_Delete(&inv, r);
+      }
     } else c = n_Init(1, r);
-    
+
     return;
   }
@@ -186 +206 @@
 
     curr = n_Init(1, r); // ???
-    
+
     number inv = n_Invers(t, r);
-    
+
     while( numberCollectionEnumerator.MoveNext() )
     {
@@ -195 +215 @@
 //      n_Normalize(n, r); // ?
     }
-    
+
     n_Delete(&inv, r);
 
@@ -218 +238 @@
   if ( nCoeff_has_simple_Alloc(r) && nCoeff_has_simple_Alloc(aRing) )
     return a;
-        else
+  else
     return n_Copy(a, r);
 }
@@ -255 +275 @@
 
 number ndInitMPZ(mpz_t m, const coeffs r)
-{ 
+{
   return n_Init( mpz_get_si(m), r);
 }
@@ -281 +301 @@
  NULL,        /* n_algExt */
  NULL,        /* n_transExt */
- #endif   
+ #endif
  ngcInitChar,  /* n_long_C */
  #ifdef HAVE_RINGS
@@ -294 +314 @@
  NULL,         /* n_Z2m */
  #endif
- NULL   /* n_CF */
+ NULL         /* n_CF */
 };
 
@@ -335 +355 @@
     n->cfInitMPZ = ndInitMPZ;
     n->cfMPZ = ndMPZ;
+    n->cfPower = ndPower;
 
     // n->cfKillChar = ndKillChar; /* dummy */
@@ -343 +364 @@
     n->cfFarey = ndFarey;
     n->cfParDeg = ndParDeg;
-    
+
     n->cfParameter = ndParameter;
 
@@ -357 +378 @@
 #endif
 
-#ifdef fACTORY
     n->convSingNFactoryN=ndConvSingNFactoryN;
     n->convFactoryNSingN=ndConvFactoryNSingN;
-#endif
-    
+
     BOOLEAN nOK=TRUE;
     // init
@@ -378 +397 @@
     if (n->cfExactDiv==NULL) n->cfExactDiv=n->cfDiv;
     if (n->cfSubringGcd==NULL) n->cfSubringGcd=n->cfGcd;
-    
+
 #ifdef HAVE_RINGS
     if (n->cfGetUnit==NULL) n->cfGetUnit=n->cfCopy;
@@ -413 +432 @@
 
     assume( (n->iNumberOfParameters == 0 && n->pParameterNames == NULL) ||
-            (n->iNumberOfParameters >  0 && n->pParameterNames != NULL) );           
+            (n->iNumberOfParameters >  0 && n->pParameterNames != NULL) );
 
     assume(n->cfParameter!=NULL);
     assume(n->cfParDeg!=NULL);
-     
+
     assume(n->cfRead!=NULL);
     assume(n->cfNormalize!=NULL);
@@ -427 +446 @@
     assume(n->cfIsMOne!=NULL);
     assume(n->cfGreaterZero!=NULL);
-    assume(n->cfPower!=NULL);
     assume(n->cfGetDenom!=NULL);
     assume(n->cfGetNumerator!=NULL);
@@ -441 +459 @@
     assume(n->cfClearContent != NULL);
     assume(n->cfClearDenominators != NULL);
-    
+
 #ifdef LDEBUG
     if(n->cfDBTest==NULL)
@@ -447 +465 @@
 #endif
     assume(n->type==t);
-     
+
 #ifndef SING_NDEBUG
     if(n->cfKillChar==NULL) Warn("cfKillChar is NULL for coeff %d",t);
@@ -454 +472 @@
     if(n->cfCoeffString==ndCoeffString) Warn("cfCoeffString is undefined for coeff %d",t);
 #endif
-     
+
    if( n->nNULL == NULL )
      n->nNULL = n_Init(0, n); // may still remain NULL
@@ -526 +544 @@
 
 void n_Print(number& a,  const coeffs r)
-{ 
-   assume(r != NULL); 
-   n_Test(a,r); 
-   
-   StringSetS("");  
-   n_Write(a, r); 
+{
+   assume(r != NULL);
+   n_Test(a,r);
+
+   StringSetS("");
+   n_Write(a, r);
    { char* s = StringEndS(); Print("%s", s); omFree(s); }
 }