Changeset b46956 in git

Timestamp:

Feb 25, 2011, 4:00:21 PM (13 years ago)

Author:

Frank Seelisch <seelisch@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

ec92f3bb0df03cbee5e7f48c9e22c1f12f13ea31

Parents:

cddd229e757bb24f9081c05147f8b264a8d11765

Message:

started to separate code for algebraic and transcendental extensions

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

Location:

kernel

Files:

• Makefile.in (modified) (1 diff)
• longalg.cc (modified) (1 diff)
• longalg.h (modified) (2 diffs)
• longtrans.cc (added)
• longtrans.h (added)
• numbers.cc (modified) (3 diffs)

kernel/Makefile.in

@@ -115 +115 @@
     pShallowCopyDelete.cc fast_mult.cc digitech.cc \
     tgb.cc tgbgauss.cc ringgb.cc f5data.cc f5lists.cc f5gb.cc \
-    f5c.cc F5cLists.cc ratgring.cc shiftgb.cc gfan.cc linearAlgebra.cc
+    f5c.cc F5cLists.cc ratgring.cc shiftgb.cc gfan.cc \
+    linearAlgebra.cc longtrans.cc
 CXXSOURCES2     = SingularBuilder.cpp
 

kernel/longalg.cc

@@ -219 +219 @@
 
 /*3
-*  division with rest; f = g*q + r, returns r and destroy f
-*/
-napoly napRemainder(napoly f, const napoly  g)
+*  division with remainder: f = g*q + r,
+*  returns r and destroys f
+*/
+napoly napRemainder(napoly f, const napoly g)
 {
   napoly a, h, qq;

kernel/longalg.h

@@ -26 +26 @@
 extern napoly naMinimalPoly;
 extern ring nacRing;
-
+extern int naNumbOfPar;
 
 void naSetChar(int p, ring r);
@@ -79 +79 @@
 #define napAdd(p1,p2)          (p_Add_q(p1,p2,currRing->algring))
 #define napSetm(p)             p_Setm(p,currRing->algring)
-#define nanumber               lnumber
+// #define nanumber               lnumber
 napoly napRemainder(napoly f, const napoly  g);
-number   naGetDenom(number &n, const ring r);
-number   naGetNumerator(number &n, const ring r);
+number naGetDenom(number &n, const ring r);
+number naGetNumerator(number &n, const ring r);
 #endif
 

kernel/numbers.cc

@@ -17 +17 @@
 #include <kernel/longrat.h>
 #include <kernel/longalg.h>
+#include <kernel/longtrans.h>
 #include <kernel/modulop.h>
 #include <kernel/gnumpfl.h>
@@ -139 +140 @@
   else if (rField_is_Extension(r))
   {
-    naSetChar(c,r);
-    if (rField_is_Q_a()) nInit_bigint=naMap00;
-    if (rField_is_Zp_a()) nInit_bigint=naMap0P;
+    if (r->minpoly == NULL)
+    {
+      naSetChar(c,r);
+      if (rField_is_Q_a()) nInit_bigint=naMap00;
+      if (rField_is_Zp_a()) nInit_bigint=naMap0P;
+    }
+    else
+    {
+      ntSetChar(c,r);
+      if (rField_is_Q_a()) nInit_bigint=ntMap00;
+      if (rField_is_Zp_a()) nInit_bigint=ntMap0P;
+    }
   }
 #ifdef HAVE_RINGS
@@ -312 +322 @@
   {
     //naInitChar(c,TRUE,r);
-    n->cfDelete = naDelete;
-    n-> nNormalize = naNormalize;
-    n->cfInit      = naInit;
-    n->nPar        = naPar;
-    n->nParDeg     = naParDeg;
-    n->n_Int       = naInt;
-    n->nAdd        = naAdd;
-    n->nSub        = naSub;
-    n->nMult       = naMult;
-    n->nDiv        = naDiv;
-    n->nExactDiv   = naDiv;
-    n->nIntDiv     = naIntDiv;
-    n->nNeg        = naNeg;
-    n->nInvers     = naInvers;
-    n->nCopy       = naCopy;
-    n->cfCopy      = na_Copy;
-    n->nGreater    = naGreater;
-    n->nEqual      = naEqual;
-    n->nIsZero     = naIsZero;
-    n->nIsOne      = naIsOne;
-    n->nIsMOne     = naIsMOne;
-    n->nGreaterZero= naGreaterZero;
-    n->cfWrite     = naWrite;
-    n->nRead       = naRead;
-    n->nPower      = naPower;
-    n->nGcd        = naGcd;
-    n->nLcm        = naLcm;
-    n->cfSetMap    = naSetMap;
-    n->nName       = naName;
-    n->nSize       = naSize;
-    n->cfGetDenom   = naGetDenom;
-    n->cfGetNumerator= naGetNumerator;
-#ifdef LDEBUG
-    n->nDBTest     = naDBTest;
+    n->cfDelete       = naDelete;
+    n-> nNormalize    = naNormalize;
+    n->cfInit         = naInit;
+    n->nPar           = naPar;
+    n->nParDeg        = naParDeg;
+    n->n_Int          = naInt;
+    n->nAdd           = naAdd;
+    n->nSub           = naSub;
+    n->nMult          = naMult;
+    n->nDiv           = naDiv;
+    n->nExactDiv      = naDiv;
+    n->nIntDiv        = naIntDiv;
+    n->nNeg           = naNeg;
+    n->nInvers        = naInvers;
+    n->nCopy          = naCopy;
+    n->cfCopy         = na_Copy;
+    n->nGreater       = naGreater;
+    n->nEqual         = naEqual;
+    n->nIsZero        = naIsZero;
+    n->nIsOne         = naIsOne;
+    n->nIsMOne        = naIsMOne;
+    n->nGreaterZero   = naGreaterZero;
+    n->cfWrite        = naWrite;
+    n->nRead          = naRead;
+    n->nPower         = naPower;
+    n->nGcd           = naGcd;
+    n->nLcm           = naLcm;
+    n->cfSetMap       = naSetMap;
+    n->nName          = naName;
+    n->nSize          = naSize;
+    n->cfGetDenom     = naGetDenom;
+    n->cfGetNumerator = naGetNumerator;
+#ifdef LDEBUG
+    n->nDBTest        = naDBTest;
 #endif
   }