Changeset 6ccd426 in git

Timestamp:

May 14, 2010, 3:10:31 PM (14 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

830743981da9efd7be7056e1a0b5e320ea114eee

Parents:

7019c8f07f02f8eb0e06dd6cc2a707f095f60dd7

Message:

restructuring algebraic extensions and rational function fields

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

Location:

kernel

Files:

• AlgebraicExt.cc (copied) (copied from kernel/longalg.cc) (24 diffs)
• AlgebraicExt.h (added)
• RatFunctField.cc (moved) (moved from kernel/longalg.cc) (2 diffs)
• RatFunctField.h (added)
• longalg.h (deleted)

kernel/AlgebraicExt.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id$ */
+/* $Id: AlgebraicExt.cc 12469 2010-05-14 10:39:49Z frank $ */
 /*
-* ABSTRACT:   algebraic numbers
+* ABSTRACT: elements of an algebraic extension field
+*
+* This field has the form K(a), where K is itself a field,
+* and a is algebraic over K. The elements in K(a) can be
+* treated as a specific type of number, see numbers.h.
+* This implementation declares a global variable 'nacRing'
+* which is a valid SINGULAR ring representing K[a]. Like-
+* wise, the minimal polynomial of a over K is stored in
+* the global variable 'naMinimalPoly'.
 */
 
@@ -19 +27 @@
 #include "ideals.h"
 #include "ring.h"
+
 #ifdef HAVE_FACTORY
 #include "factory.h"
@@ -24 +33 @@
 #include "clapconv.h"
 #endif
-#include "longalg.h"
+/* HAVE_FACTORY */
+
+#include "AlgebraicExt.h"
 
 struct snaIdeal
@@ -31 +42 @@
   napoly *liste;
 };
-typedef struct snaIdeal * naIdeal;
-
-naIdeal naI=NULL;
+
+typedef struct snaIdeal* naIdeal;
+
+naIdeal naI = NULL;
 
 omBin snaIdeal_bin = omGetSpecBin(sizeof(snaIdeal));
@@ -100 +112 @@
   if (r->minpoly!=NULL)
   {
-    naMinimalPoly=((lnumber)r->minpoly)->z;
+    naMinimalPoly=r->minpoly;
     #ifdef LDEBUG
     omCheckAddr(naMinimalPoly);
@@ -232 +244 @@
   do
   {
-    napSetExp(qq,1, p_GetExp(a,1,nacRing) - p_GetExp(g,1,nacRing));
+    napSetExp(qq,p_GetExp(a,1,nacRing) - p_GetExp(g,1,nacRing));
     napSetm(qq);
     pGetCoeff(qq) = nacDiv(pGetCoeff(a), pGetCoeff(g));
@@ -262 +274 @@
   do
   {
-    napSetExp(qq,1, p_GetExp(a,1,nacRing) - p_GetExp(g,1,nacRing));
+    napSetExp(qq, p_GetExp(a,1,nacRing) - p_GetExp(g,1,nacRing));
     p_Setm(qq,nacRing);
     pGetCoeff(qq) = nacDiv(pGetCoeff(a), pGetCoeff(g));
@@ -498 +510 @@
     {
       s = eati(s, &j);
-      napAddExp(ex,i+1,j);
+      napAddExp(ex,j);
     }
     else
-      napAddExp(ex,i+1,1);
+      napAddExp(ex,1);
   }
   return s;
@@ -511 +523 @@
   {
     s+=strlen(naParNames[i]);
-    napSetExp(ex,i+1,1);
+    napSetExp(ex,1);
   }
   return s;
@@ -745 +757 @@
     if (pNext(y)==NULL)
     {
-      napSetExp(g,1, napExp(x, y));
+      napSetExp(g,napExp(x, y));
       p_Setm(g,nacRing);
       return g;
@@ -769 +781 @@
     p_Delete(&y,nacRing);
     p_LmDelete(&h,nacRing);
-    napSetExp(g,1, napExp(a, b));
+    napSetExp(g,napExp(a, b));
     p_Setm(g,nacRing);
     return g;
@@ -781 +793 @@
   for (i=(naNumbOfPar-1); i>=0; i--)
   {
-    napSetExp(x,i+1, napExpi(i,a,b));
+    napSetExp(x,napExpi(i,a,b));
     p_Setm(x,nacRing);
   }
@@ -845 +857 @@
       pGetCoeff(h) = nacCopy(pGetCoeff(q));
       for (j=naNumbOfPar; j>0; j--)
-        napSetExp(h,j, p_GetExp(q,j,nacRing) - p_GetExp(naI->liste[i],j,nacRing));
+        napSetExp(h,p_GetExp(q,j,nacRing) - p_GetExp(naI->liste[i],j,nacRing));
       p_Setm(h,nacRing);
       h = p_Mult_q(h, napCopy(naI->liste[i]),nacRing);
@@ -924 +936 @@
   l->s = 2;
   l->z = p_ISet(1,nacRing);
-  napSetExp(l->z,i,1);
+  napSetExp(l->z,1);
   p_Setm(l->z,nacRing);
   l->n = NULL;
@@ -972 +984 @@
 void naDelete(number *p, const ring r)
 {
-  if ((*p)!=r->minpoly)
+  if (((napoly)(*p))!=r->minpoly)
   {
     lnumber l = (lnumber) * p;
@@ -1861 +1873 @@
   }
   /* normalize all coefficients in n and z (if in Q) */
-  if (norm) 
+  if (norm)
   {
     naCoefNormalize(pp);
@@ -1881 +1893 @@
         while (xx != NULL)
         {
-          napAddExp(xx,i+1, -m);
+          napAddExp(xx, -m);
           pIter(xx);
         }
         while (yy != NULL)
         {
-          napAddExp(yy,i+1, -m);
+          napAddExp(yy, -m);
           pIter(yy);
         }
@@ -2236 +2248 @@
   int i;
   for(i=1;i<=naParsToCopy;i++)
-    napSetExp(a,i,napGetExpFrom(p,i,naMapRing));
+    napSetExp(a,napGetExpFrom(p,naMapRing));
   p_Setm(a,nacRing);
   pGetCoeff(w) = nacMap(pGetCoeff(p));
@@ -2246 +2258 @@
     pIter(a);
     for(i=1;i<=naParsToCopy;i++)
-      napSetExp(a,i,napGetExpFrom(p,i,naMapRing));
+      napSetExp(a,napGetExpFrom(p,naMapRing));
     p_Setm(a,nacRing);
     pGetCoeff(a) = nacMap(pGetCoeff(p));
@@ -2269 +2281 @@
       if (par_perm!=NULL) e=par_perm[i-1];
       else                e=-i;
-      int ee=napGetExpFrom(p,i,src_ring);
+      int ee=napGetExpFrom(p,src_ring);
       if (e<0)
-        napSetExp(w,-e,ee);
+        napSetExp(w,ee);
       else if (ee>0)
         not_null=FALSE;
@@ -2452 +2464 @@
     for(i=0;i<P;i++)
     {
-      if(napGetExpFrom(za,i+1,oldRing)!=0)
+      if(napGetExpFrom(za,oldRing)!=0)
       {
         if(par_perm==NULL)
@@ -2458 +2470 @@
           if ((rPar(currRing)>=i) && (pa!=NULL))
           {
-            napSetExp(pa,i+1,napGetExpFrom(za,i+1,oldRing));
+            napSetExp(pa,napGetExpFrom(za,oldRing));
             p_Setm(pa,nacRing);
           }
@@ -2468 +2480 @@
         }
         else if(par_perm[i]>0)
-          pSetExp(p,par_perm[i],napGetExpFrom(za,i+1,oldRing));
+          pSetExp(p,par_perm[i],napGetExpFrom(za,oldRing));
         else if((par_perm[i]<0)&&(pa!=NULL))
         {
-          napSetExp(pa,-par_perm[i], napGetExpFrom(za,i+1,oldRing));
+          napSetExp(pa,napGetExpFrom(za,oldRing));
           p_Setm(pa,nacRing);
         }
@@ -2528 +2540 @@
 
 #ifdef LDEBUG
-BOOLEAN naDBTest(number a, const char *f,const int l)
+BOOLEAN naDBTest(number a, const char *f, const int l)
 {
   lnumber x=(lnumber)a;

kernel/RatFunctField.cc

@@ -2 +2 @@
 *  Computer Algebra System SINGULAR     *
 ****************************************/
-/* $Id$ */
+/* $Id: RatFunctField.cc 12469 2010-05-14 10:39:49Z frank $ */
 /*
-* ABSTRACT:   algebraic numbers
+* ABSTRACT: elements of a rational function field
+*
+* This field has the form K(t_1, t_2, ..., t_m), where K is
+* itself a field, and the t_i are transcendental over K.
+* The elements in K(t_1, t_2, ..., t_m) can be treated as a
+* specific type of number, see numbers.h.
 */
 
@@ -24 +29 @@
 #include "clapconv.h"
 #endif
-#include "longalg.h"
-
-struct snaIdeal
+#include "RatFunctField.h"
+
+struct snratIdeal
 {
   int anz;
-  napoly *liste;
+  poly *liste;
 };
-typedef struct snaIdeal * naIdeal;
-
-naIdeal naI=NULL;
-
-omBin snaIdeal_bin = omGetSpecBin(sizeof(snaIdeal));
-
-int naNumbOfPar;
-napoly naMinimalPoly;
-#define naParNames (currRing->parameter)
-static int naIsChar0;
-static ring naMapRing;
+
+typedef struct snratIdeal* nratIdeal;
+
+nratIdeal nratI = NULL;
+
+omBin snratIdeal_bin = omGetSpecBin(sizeof(snratIdeal));
+
+int nratNumbOfPar;
+#define nratParNames (currRing->parameter)
+static int nratIsChar0;
+static ring nratMapRing;
 
 #ifdef LDEBUG
-#define naTest(a) naDBTest(a,__FILE__,__LINE__)
-BOOLEAN naDBTest(number a, const char *f,const int l);
+  #define nratTest(a) nratDBTest(a,__FILE__,__LINE__)
+  BOOLEAN nratDBTest(number a, const char *f,const int l);
 #else
-#define naTest(a)
+  #define nratTest(a)
 #endif
-
-number (*naMap)(number from);
+/* LDEBUG */
+
+number (*nratMap)(number from);
 /* procedure variables */
 static numberfunc