Changeset a1bbf6 in git

Timestamp:

Mar 31, 2015, 10:47:36 AM (8 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8e0ad00ce244dfd0756200662572aef8402f13d5')

Children:

2851932a1bfd822c8a77ba701ab4061fda4db650

Parents:

f6cd60bc278fb9a300668ad9a5c51e492c8b6409320644e83870d617264b4e83eea678323a62d15a

Message:

Merge branch 'tigistdereje-algemodstd' into spielwiese

Files:

• Singular/LIB/nfmodstd.lib (moved) (moved from Singular/LIB/algemodstd.lib) (6 diffs)
• Tst/Long/algemodstd_l.res.gz.uu (deleted)
• Tst/Long/algemodstd_l.stat (deleted)
• Tst/Long/nfmodstd_l.res.gz.uu (added)
• Tst/Long/nfmodstd_l.stat (added)
• Tst/Long/nfmodstd_l.tst (moved) (moved from Tst/Long/algemodstd_l.tst) (6 diffs)
• Tst/Long/ok_l2.lst (modified) (1 diff)
• Tst/Short.lst (modified) (1 diff)
• Tst/Short/algemodstd_s.res.gz.uu (deleted)
• Tst/Short/algemodstd_s.stat (deleted)
• Tst/Short/nfmodstd_s.res.gz.uu (added)
• Tst/Short/nfmodstd_s.stat (added)
• Tst/Short/nfmodstd_s.tst (moved) (moved from Tst/Short/algemodstd_s.tst) (5 diffs)
• doc/singular.doc (modified) (previous)
• libpolys/polys/nc/gb_hack.h (modified) (1 diff)

Singular/LIB/nfmodstd.lib

@@ -1 +1 @@
 ////////////////////////////////////////////////////////////////////////////////
-version="version algemodstd.lib 4.0.1.0 Sep_2014 ";  // $Id$
+version="version nfmodstd.lib 4.0.1.0 Sep_2014 ";  // $Id$
 category="Commutative Algebra";
 info="
 
-LIBRARY:   algemodstd.lib  Groebner bases of ideals in polynomial rings
+LIBRARY:   nfmodstd.lib  Groebner bases of ideals in polynomial rings
                            over algebraic number fields
 AUTHORS:   D.K. Boku       boku@mathematik.uni-kl.de
@@ -33 +33 @@
 PROCEDURES:
   chinrempoly(l,m);       chinese remaindering for polynomials
-  algemodStd(I);          standard basis of I over algebraic number field using modular methods
+  nfmodStd(I);          standard basis of I over algebraic number field using modular methods
 ";
 
@@ -443 +443 @@
     intvec opt = option(get);
     option(redSB);
-    I = modular("Algemodstd::LiftPolyCRT", list(I), PrimeTestTask, Modstd::deleteUnluckyPrimes_std,
+    I = modular("Nfmodstd::LiftPolyCRT", list(I), PrimeTestTask, Modstd::deleteUnluckyPrimes_std,
               PtestStd, Modstd::finalTest_std,536870909);
     attrib(I, "isSB", 1);
@@ -452 +452 @@
 ////////////////////////////////////////////////////////////////////////////////
 /* main procedure */
-proc algemodStd(ideal I, list #)
-"USAGE:  algemodStd(I, #); I ideal, # optional parameters
+proc nfmodStd(ideal I, list #)
+"USAGE:  nfmodStd(I, #); I ideal, # optional parameters
 RETURN:  standard basis of I over algebraic number field
 NOTE: The procedure passes to @ref{modStd} if the ground field has no
@@ -459 +459 @@
       are directly passed to @ref{modStd}.
 SEE ALSO: modStd
-EXAMPLE: example algemodStd; shows an example
+EXAMPLE: example nfmodStd; shows an example
 "
 {
@@ -512 +512 @@
     minpoly =a^2+1;
     ideal k=(a/2+1)*x^2+2/3y, 3*x-a*y+ a/7+2;
-    ideal I=algemodStd(k);
+    ideal I=nfmodStd(k);
     I;
     ring r2 =(0,a),(x,y,z),dp;
     minpoly =a^3 +2;
     ideal k=(a^2+a/2)*x^2+(a^2 -2/3*a)*yz, (3*a^2+1)*zx-(a+4/7)*y+ a+2/5;
-    ideal IJ=algemodStd(k);
+    ideal IJ=nfmodStd(k);
     IJ;
     ring r3=0,(x,y),dp;// ring without parameter
     ideal I = x2 + y, xy - 7y + 2x;
-    I=algemodStd(I);
+    I=nfmodStd(I);
     I;
 }

Tst/Long/nfmodstd_l.tst

@@ -1 +1 @@
 LIB "tst.lib";
-LIB "algemodstd.lib";
+LIB "nfmodstd.lib";
 tst_init();
-proc tst_test_algemodstd(ideal I)
+proc tst_test_nfmodstd(ideal I)
 {
-   ideal Jtst = algemodStd(I);
+   ideal Jtst = nfmodStd(I);
    Jtst;
 }
@@ -16 +16 @@
           -x*w^7+y*w^7];
 
- tst_test_algemodstd(HJa);
+ tst_test_nfmodstd(HJa);
 kill r;
 ring r=(0,a),(x,y,z,w,u,v,n),dp;
@@ -24 +24 @@
           8*x^3+(12*a+a^2)*y^3 +x*z^2+3,
           (7*a^2-a)*x^2*y^4+18*y^3*z^2+y^3*z^3];
-tst_test_algemodstd(I1);
+tst_test_nfmodstd(I1);
 
 ideal HUa = [a*x+(a-1)*y+(a+2)*w+u,x*y+(a-1)*y*z+z*w + (a+2)*x*w+a*w*u,
             a*x*y*z+(a+5)*y*z*w+a*x*y*u+(a+2)*x*w*u+a*z*w*u,(a-11)*x*y*z*w+(a+5)*x*y*z*u+a*x*y*w*u +
             a*x*z*w*u+a*y*z*w*u,(a + 3)*x*y*z*w*u -(a+23)*v^5];
-tst_test_algemodstd(HUa);
+tst_test_nfmodstd(HUa);
 kill r;
 ring r=(0,a),(x,y,z,w,u,v,n),dp;
@@ -36 +36 @@
           + (a+1)*z*w*u+x*y*v+x*u*v+w*u*v,(a-1)*x*y*z*w + y*z*w*u +x*y*z*v +x*y*u*v+ x*w*u*v+ z*w*u*v,
           x*y*z*w*u+(a+1)*x*y*z*w*v+x*y*z*u*v+x*y*w*u*v+x*z*w*u*v+y*z*w*u*v,x*y*z*w*u*v-a+2];
-tst_test_algemodstd(I6a);
+tst_test_nfmodstd(I6a);
 kill r;
 ring r=(0,a),(x,y,z,w,u,v,n),dp;
@@ -43 +43 @@
             2*w*y^3-10*y^2 - 10*w*y,(w^2-a^2+2*a)*x + 11*w*y*z-2*z, (-z^2 + 4*w^2+a^2+2)*x*z
             + (4*w*z^2 + 2*w^3-10*w)*y + 4*z^2-10*w^2 + a^2+a];
-tst_test_algemodstd(I);
+tst_test_nfmodstd(I);
 ideal I1= [(2*w*y-(2*a+3)*z^2)*x-z*y^2-z^2*x,
             2*z*x^2*w + (4*w*y + 5*z^2)*x^2 + (4*z*y^2 + 4*z^2*w)*x + 2*w*y^3-10*x^2*y^2 - 10*x*w*y*z,
             (w^2-(a^2+a)*y*z)*x + 11*w*y*z-2*z^3,
             (-z^2 + 4*w^2 + (a^2+2)*y^2)*x*z + (4*w*z^2 + 2*w^3-10*w^3)*y + 4*z^2*x*y-10*w^2*x*z + (a^2+2)*y^3*w];
-            tst_test_algemodstd(I1);
+            tst_test_nfmodstd(I1);
 kill r;
 ring r=(0,a),(x,y,z,w,u),dp;
@@ -55 +55 @@
           (a + 2)*x*w + a*w*u,a*x*y*z + (a + 5)*y*z*w + a*x*y*u + (a+2)*x*w*u + a*z*w*u,
           (a-11)*x*y*z*w + (a + 5)*x*y*z*u + a*x*y*w*u + a*x*z*w*u + a*y*z*w*u,(a + 3)*x*y*z*w*u + a+23];
-tst_test_algemodstd(Ua);
+tst_test_nfmodstd(Ua);
 kill r;
 

Tst/Long/ok_l2.lst

@@ -1 @@
-algemodstd_l
+nfmodstd_l
 bug_tr642
 bug_tr677

Tst/Short.lst

@@ -2 +2 @@
 Short/alexpoly.tst
 Short/algebralib.tst
-Short/algemodstd_s
+Short/nfmodstd_s
 Short/allres_s.tst
 Short/arcAtPoint.tst

Tst/Short/nfmodstd_s.tst

@@ -1 +1 @@
 LIB "tst.lib";
-LIB "algemodstd.lib";
+LIB "nfmodstd.lib";
 tst_init();
 
-proc tst_test_algemodstd(ideal I)
+proc tst_test_nfmodstd(ideal I)
 {
-   ideal Jtst = algemodStd(I);
+   ideal Jtst = nfmodStd(I);
    Jtst;
 }
@@ -15 +15 @@
           8*x^3+(12+a)*y^3+x*z^2+3,
           (7-a)*x^2*y^4+18*y^3*z^2+y^3*z^3];
-tst_test_algemodstd(HIa);
+tst_test_nfmodstd(HIa);
 ideal HJa=[(2*a+3)*x*y^4*z^2 + (a+2)*x^2*y^3*z*w-x^2*y^3*z*w + 2*x*y*z^2*w^3 + (7*a-1)*y^3*w^4,
           2*x^2*y^4*z + x^2*y*z^2*w^2-a*x*y^2*z^2*w^2 + (a+11)*x^2*y*z*w^3 -12*x*w^6 + 12*y*w^6,
@@ -22 +22 @@
           -x*w^7+y*w^7];
 
- tst_test_algemodstd(HJa);
+ tst_test_nfmodstd(HJa);
 ideal HBa =[x+(a/2147483647)*x*y+(a/2147483646)*y*z,
           x^2*z + (a/2147483647)*y^3 + (a+1)*y*z^2,
           (2*a*x)/3-(7*a*y)/23 + (9*z)/7];
 
-  tst_test_algemodstd(HBa);
+  tst_test_nfmodstd(HBa);
 kill r;
 ring r=(0,a),(x,y,z,w,u),dp;
@@ -34 +34 @@
         (a+3)*x*y^2*z^2 + (a+1)*x^5 + (a-11)*y^2*z^2,
         (a+2)*x*y*z + (a+7)*x^3 + 12*y^3 + 1,3*x^3 +(a- 4)*y^3 + y*z^2];
-tst_test_algemodstd(ka);
+tst_test_nfmodstd(ka);
 
 ideal Hka=[(a+5)*x^3*y^2*z + (a-3)*y^3*x^2*z + (a+7)*x*y^2*z^2,
@@ -40 +40 @@
           4*x*y*z + (a+7)*x^3 + 12*y^3 + a*z^3,
           3*x^3 +(a- 4)*y^3 + y*z^2];
-tst_test_algemodstd(Hka);
+tst_test_nfmodstd(Hka);
 
 ideal Ua = [a*x + (a-1)*y + z + (a+2)*w + u,x*y + (a-1)*y*z + z*w +
           (a + 2)*x*w + a*w*u,a*x*y*z + (a + 5)*y*z*w + a*x*y*u + (a+2)*x*w*u + a*z*w*u,
           (a-11)*x*y*z*w + (a + 5)*x*y*z*u + a*x*y*w*u + a*x*z*w*u + a*y*z*w*u,(a + 3)*x*y*z*w*u + a+23];
-tst_test_algemodstd(Ua);
+tst_test_nfmodstd(Ua);
 kill r;
 

libpolys/polys/nc/gb_hack.h

@@ -51 +51 @@
 D(ideal sca_mora(const ideal, const ideal, const intvec *, const intvec *, kStrategy, const ring _currRing))
 
-D(poly kNF(ideal, ideal, poly, int, int, const ring _currRing))
+D(poly k_NF(ideal, ideal, poly, int, int, const ring _currRing))
 
 #endif // # ifdef PLURAL_INTERNAL_DECLARATIONS_GB_HACK