Changeset a42239 in git

Timestamp:

Apr 4, 1998, 1:18:16 AM (26 years ago)

Author:

Kai Krüger <krueger@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

fa842032519085fea6da2813d2d35f50f4b93491

Parents:

5480dab448af565abfd5b8f28e1766de56df7613

Message:

*** empty log message ***


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

Location:

Singular/LIB

Files:

• classify.lib (modified) (9 diffs)
• makedbm.lib (modified) (4 diffs)

Singular/LIB/classify.lib

@@ -1 @@
-// $Id: classify.lib,v 1.19 1997-12-15 10:35:03 krueger Exp $
+// $Id: classify.lib,v 1.20 1998-04-03 23:18:15 krueger Exp $
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -29 +29 @@
 LIB "elim.lib";
 LIB "sing.lib";
+
+///////////////////////////////////////////////////////////////////////////////
+proc classify_init
+{
+  string s;
+  link l="DBM:r NFlist";
+  s = read(l,"VERSION");
+  if (s == "" ) {
+    "(classify.lib): Need to create database...";
+    LIB"makedbm.lib";
+    create_sing_dbm();
+  }
+  close(l);
+  l="DBM:r NFlist";
+  s = read(l,"VERSION");
+  //"(classify.lib): Creation done. Current version:", s;
+}
 ///////////////////////////////////////////////////////////////////////////////
 
@@ -66 +83 @@
   map conv_ext2top=ring_ext,maxideal(1);
 
+  if(defined(@ringdisplay)!=0) { kill @ringdisplay; }
   string @ringdisplay = "ring_ext";
   export @ringdisplay;
@@ -119 +137 @@
     }
     @ringdisplay = "setring RingB;";
+    if(defined(RingB)!=0) { kill RingB; }
     execute ("ring RingB="+charstr(basering)+",("+A_Z("x", n)+"),(c,ds);");
     export RingB;
@@ -151 +170 @@
     f = jet(f, K);
     v = HKclass(milnorcode(f));
-    if(v[2]>0) { debug_log(0, "Guessing type via Hilbert polynomial: ", v[1]);}
+    if(v[2]>0) { debug_log(0, "Guessing type via Milnorcode: ", v[1]);}
     else { 
       debug_log(0, "Hilbert polynomial not recognised. Milnor code = ",
@@ -439 +458 @@
       if(Dim==0) { return(printresult(23,f,"Z["+string(p-1)+",0]", cstn, p)); }
       if( Mult == 1 ) { 
-         return(printresult(24, f, "Z["+string(p-1)+","+string(Mu-15)+"]", 
+         return(printresult(24, f, "Z["+string(p-1)+","+string(Mu-3-6*p)+"]", 
                 cstn, p));
       }
@@ -1722 +1741 @@
 RETURN:   Normal form of f in Arnold's list
 REMARK:   try to determine the normal form of f by invariants, mainly by
-          computing the Hilbert funktion of the Milnor albegra,
+          computing the Hilbert function of the Milnor albegra,
           no coordinate change is needed (see also proc 'milnorcode').
 EXAMPLE:  example quickclass; shows an example
@@ -2220 +2239 @@
   list v, ret;
 
+  classify_init();
   ret = 0, 0;
   k = #[1];
@@ -2439 +2459 @@
 proc basicinvariants(poly f)
 USAGE:    basicinvariants(f);   f = poly
-COMPUTE:  Compute basic invariants of f: an upper bound d for the determinacy,
-          the milnor number mu and the corank c of f
+COMPUTE:  Compute basic invariants of f: an upper bound d for the
+          determinacy, the milnor number mu and the corank c of f
 RETURN:   intvec: d, mu, c
 EXAMPLE:  example basicinvariants; shows an example

Singular/LIB/makedbm.lib

@@ -1 @@
-// $Id: makedbm.lib,v 1.5 1997-12-15 10:35:07 krueger Exp $
+// $Id: makedbm.lib,v 1.6 1998-04-03 23:18:16 krueger Exp $
 //=========================================================================
 //
@@ -10 +10 @@
    dbm_read(l);          read all entries from a DBM-databaes pointed by l
    dbm_getnext(l);       read next entry from a DBM-databaes pointed by l
-
-//=============================================================================
-proc _init()
-{
-  "_init() makedbm started";
-}
-
+   create_sing_dbm();
+   read_sing_dbm();
+
+//=============================================================================
+
+proc makedbm_init()
+{
+  string s;
+  link l="DBM:r NFlist";
+  s = read(l,"VERSION");
+  if (s == "" ) {
+    "Need to create database...";
+    create_sing_dbm();
+  }
+  close(l);
+  l="DBM:r NFlist";
+  s = read(l,"VERSION");
+  "Creation done. Current version:", s;
+}
 //=============================================================================
 
@@ -63 +75 @@
   write(l, "X[1,0]", "x4+a*x2y2+y4");
   write(l, "X[1,r]", "x4+x2y2+a*y^(4+r)");
-  write(l, "X[k,0]", "x4+b*x3y^k+a*x2y^(2*k) + xy^(3*k)");
-  write(l, "X[k,r]", "x4+a*x3*y^k+x2y^(2*k)+b*(y^(4*k+r))");
-  write(l, "W[12k]", "x4+y^(4*k+1)+a*x*(y^(3*k+1))+c*x2*(y^(2*k+1))");
-  write(l, "W[12k+1]", "x4+x*(y^(3*k+1))+a*x2*(y^(2*k+1))+c*y^(4*k+2)");
+  write(l, "X[k,0]", "x4+b*x^3*y^k+a*x^2*y^(2*k) + x*y^(3*k)");
+  write(l, "X[k,r]", "x4+a*x^3*y^k+x^2*y^(2*k)+b*(y^(4*k+r))");
+  write(l, "W[12k]", "x4+y^(4*k+1)+a*x*(y^(3*k+1))+c*x^2*(y^(2*k+1))");
+  write(l, "W[12k+1]", "x4+x*(y^(3*k+1))+a*x^2*(y^(2*k+1))+c*y^(4*k+2)");
   write(l, "W[12k+5]", "x4+x*(y^(3*k+2))+a*x2*(y^(2*k+2))+b*y^(4*k+3)");
   write(l, "W[12k+6]", "x4+y^(4*k+3)+a*x*(y^(3*k+3))+b*x2*(y^(2*k+2))");
@@ -82 +94 @@
   write(l, "Z[k,12k+6r]", "(x+a*(y^k))*(x3+x*(y^(2*k+2*r+1))+b*y^(3*k+3*r+2))");
   write(l, "Z[k,12k+6r+1]", "(x+a*(y^k))*(x3+b*x*(y^(2*k+2*r+2))+y^(3*k+3*r+2))");
-  write(l, "Z[k,0]", "y*(x3+d*x2*(y^k)+c*x*(y^(2*k+1))+y^(3*k))");
-  write(l, "Z[k,r]", "y*(x3+x2y^(k+1)+b*(y^(3*k+r+3)))");
+  write(l, "Z[k,0]", "y*(x3+d*x2*(y^(k+1))+c*x*(y^(2*k+3))+y^(3*k+3))");
+  write(l, "Z[k,r]", "y*(x3+x^2*y^(k+1)+b*(y^(3*k+r+3)))");
   write(l, "Z[6k+5]", "y*(x3+b*x*(y^(2*k+1))+y^(3*k+1))");
   write(l, "Z[6k+6]", "y*(x3+x*(y^(2*k+1))+b*y^(3*k+2))");