Changeset 7019c8 in git

Timestamp:

May 14, 2010, 3:08:55 PM (14 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

6ccd42642e34fa57aabba1214825a001582091d8

Parents:

36734cd8327fee9c0706c74346410a053f9632c9

Message:

restructuring algebraic field extensions and rational function fields

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

Files:

• Singular/extra.cc (modified) (2 diffs)
• Singular/iparith.cc (modified) (2 diffs)
• Singular/ipassign.cc (modified) (1 diff)
• Singular/ipconv.cc (modified) (1 diff)
• Singular/ipshell.cc (modified) (1 diff)
• Singular/maps_ip.cc (modified) (1 diff)
• Singular/mpsr_GetMisc.cc (modified) (1 diff)
• Singular/mpsr_GetPoly.cc (modified) (1 diff)
• Singular/mpsr_PutPoly.cc (modified) (1 diff)
• Singular/walk.cc (modified) (2 diffs)
• kernel/Makefile.in (modified) (2 diffs)
• kernel/clapconv.cc (modified) (1 diff)
• kernel/clapconv.h (modified) (1 diff)
• kernel/clapsing.h (modified) (1 diff)
• kernel/maps.cc (modified) (1 diff)
• kernel/numbers.cc (modified) (1 diff)
• kernel/polys1.cc (modified) (1 diff)
• kernel/ring.cc (modified) (1 diff)
• kernel/structs.h (modified) (1 diff)

Singular/extra.cc

@@ -46 +46 @@
 #include "febase.h"
 #include "matpol.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
 #include "ideals.h"
 #include "kstd1.h"
@@ -2249 +2249 @@
     else
 #endif
-/*==================== naIdeal ==================================*/
-    if(strcmp(sys_cmd,"naIdeal")==0)
-    {
-      if ((h!=NULL) &&(h->Typ()==IDEAL_CMD))
-      {
-        naSetIdeal((ideal)h->Data());
-        return FALSE;
-      }
-      else
-         WerrorS("ideal expected");
-    }
-    else
 /*==================== isSqrFree =============================*/
 #ifdef HAVE_FACTORY

Singular/iparith.cc

@@ -24 +24 @@
 #include "febase.h"
 #include "sdb.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
 #include "ideals.h"
 #include "matpol.h"
@@ -32 +32 @@
 #include "subexpr.h"
 #include "lists.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
 #include "modulop.h"
 #ifdef HAVE_RINGS

Singular/ipassign.cc

@@ -30 +30 @@
 #include "lists.h"
 #include "numbers.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
 #include "stairc.h"
 #include "maps.h"

Singular/ipconv.cc

@@ -19 +19 @@
 #include "modulop.h"
 #include "longrat.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
 #ifdef HAVE_RINGS
 #include "rmodulon.h"

Singular/ipshell.cc

@@ -31 +31 @@
 #include "numbers.h"
 #include "modulop.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
 #include "lists.h"
 #include "attrib.h"

Singular/maps_ip.cc

@@ -17 +17 @@
 #include "omalloc.h"
 #include "kstd1.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
 #include "lists.h"
 #include "maps.h"

Singular/mpsr_GetMisc.cc

@@ -19 +19 @@
 
 #include "mpsr_Get.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
 #include "tok.h"
 #include "maps.h"

Singular/mpsr_GetPoly.cc

@@ -25 +25 @@
 #include "ipid.h"
 #include "ring.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
 #include "maps.h"
 #include "ideals.h"

Singular/mpsr_PutPoly.cc

@@ -22 +22 @@
 #include "mpsr_Put.h"
 #include "mpsr_Tok.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
 #include "omalloc.h"
 #include "ring.h"

Singular/walk.cc

@@ -55 +55 @@
 #include "ipshell.h"
 #include "ipconv.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
 #include "ffields.h"
 #include "subexpr.h"
@@ -86 +86 @@
 #include "prCopy.h"
 #include "string.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
 #ifdef HAVE_FACTORY
 #include "clapsing.h"

kernel/Makefile.in

@@ -98 +98 @@
     khstd.cc kstdfac.cc \
     kstd1.cc kstd2.cc kutil.cc \
-    longalg.cc longrat.cc longrat0.cc \
+    AlgebraicExt.cc RatFunctField.cc longrat.cc longrat0.cc \
     maps.cc matpol.cc misc.cc gnumpfl.cc gnumpc.cc \
     rmodulo2m.cc rmodulon.cc rintegers.cc \
@@ -151 +151 @@
 
 HEADERS=hutil.h idrec.h stairc.h ideals.h \
-        longalg.h structs.h intvec.h int64vec.h longrat.h \
+        AlgebraicExt.h RatFunctField.h structs.h intvec.h int64vec.h longrat.h \
         numbers.h clapconv.h maps.h \
         clapsing.h matpol.h polys.h p_polys.h syz.h \

kernel/clapconv.cc

@@ -17 +17 @@
 #include "numbers.h"
 #include "modulop.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
+#include "RatFunctField.h"
 #include "polys.h"
 #include "febase.h"

kernel/clapconv.h

@@ -13 +13 @@
 
 #include "structs.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
 #include "ring.h"
 #include <factory.h>

kernel/clapsing.h

@@ -17 +17 @@
 #include "intvec.h"
 #include "matpol.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
+#include "RatFunctField.h"
 
 poly singclap_gcd ( poly f, poly g );

kernel/maps.cc

@@ -17 +17 @@
 #include "omalloc.h"
 #include "kstd1.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
 #include "maps.h"
 #include "prCopy.h"

kernel/numbers.cc

@@ -16 +16 @@
 #include "numbers.h"
 #include "longrat.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
 #include "modulop.h"
 #include "gnumpfl.h"

kernel/polys1.cc

@@ -19 +19 @@
 #include "weight.h"
 #include "intvec.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
 #include "ring.h"
 #include "ideals.h"

kernel/ring.cc

@@ -24 +24 @@
 #include "febase.h"
 #include "intvec.h"
-#include "longalg.h"
+#include "AlgebraicExt.h"
 #include "ffields.h"
 #include "ideals.h"

kernel/structs.h

@@ -497 +497 @@
   int*       block1; /* ending pos., rInit/rSleftvOrdering2Ordering*/
   char**     parameter; /* names of parameters, rInit */
-  number     minpoly;  /* for Q_a/Zp_a, rInit */
+  poly       minpoly;  /* for Q_a/Zp_a, rInit */
   ideal      minideal;
   int**      wvhdl;  /* array of weight vectors, rInit/rSleftvOrdering2Ordering */