Changeset 8912ce in git

Timestamp:

Aug 11, 2004, 6:11:40 PM (19 years ago)

Author:

Hans Schönemann <hannes@…>

Branches:

(u'spielwiese', '0d6b7fcd9813a1ca1ed4220cfa2b104b97a0a003')

Children:

9c561b94547cc2ee1873efed62ed03f1413f500a

Parents:

e65fe97407c42bd793157749a8b4dc89f2599006

Message:

*hannes: copy from 2-0-6


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

File:

• Singular/LIB/hnoether.lib (modified) (6 diffs)

Singular/LIB/hnoether.lib

@@ -1 @@
-version="$Id: hnoether.lib,v 1.39 2004-08-05 15:59:21 Singular Exp $";
+version="$Id: hnoether.lib,v 1.40 2004-08-11 16:11:40 Singular Exp $";
 category="Singularities";
 info="
@@ -2115 +2115 @@
          display an ideal HNE of the following form:
      @example
-     HNE[1]=-y+[]*z(0)^1+[]*z(0)^2+...+z(0)^<>*z(1)
-     HNE[2]=-x+          []*z(1)^2+...+z(1)^<>*z(2)
-     HNE[3]=             []*z(2)^2+...+z(2)^<>*z(3)
-     .......             ..........................
-     HNE[r+1]=           []*z(r)^2+[]*z(r)^3+......
+       y = []*x^1+[]*x^2   +...+x^<>*z(1)
+       x =        []*z(1)^2+...+z(1)^<>*z(2)
+       z(1) =     []*z(2)^2+...+z(2)^<>*z(3)
+       .......             ..........................
+       z(r-1) =   []*z(r)^2+[]*z(r)^3+......
      @end example
      where @code{x},@code{y} are the first 2 variables of the basering.
@@ -2181 +2181 @@
  map holematrix=altring,0;        // mappt nur die Monome vom Grad Null
  matrix m=holematrix(m);
+ int i,j;
+
+ // lossen: check the last row for finiteness (06/2004)
+ int rowM=nrows(m);
+ int colM=ncols(m);
+ int undef_bd=v[size(v)];
+ if ( undef_bd<-1 ){
+   for (j=-undef_bd; j<=colM; j++) { m[rowM,j]=0; }
+ }
+
  //--------------------- Erzeuge Matrix n mit n[i,j]=z(j-1)^i -----------------
- int i;
- matrix n[ncols(m)][nrows(m)];
- for (int j=1; j<=nrows(m); j++) {
-    for (i=1; i<=ncols(m); i++) { n[i,j]=z(j-1)^i; }
+ matrix n[colM][rowM];
+ for (j=1; j<=rowM; j++) {
+    for (i=1; i<=colM; i++) { n[i,j]=z(j-1)^i; }
  }
  matrix displaymat=m*n;
  ideal HNE;
- for (i=1; i<nrows(m); i++) { HNE[i]=displaymat[i,i]+z(i)*z(i-1)^v[i]; }
- HNE[nrows(m)]=displaymat[nrows(m),nrows(m)];
- if (nrows(m)<2) { HNE[2]=z(0); }
+ for (i=1; i<rowM; i++) { HNE[i]=displaymat[i,i]+z(i)*z(i-1)^v[i]; }
+ HNE[rowM]=displaymat[rowM,rowM];
+
+ // lossen: output modified (06/2004)
+ if (size(#) == 0) 
+ {
+   if (switch==0) {
+     HNE=subst(HNE,z(0),var(size(v)+1));
+   }
+   else  {
+     HNE=subst(HNE,z(0),var(size(v)+2));
+   }
+
+   for (j=1; j<=ncols(HNE); j++){
+     string stHNE(j)=string(HNE[j]); 
+   }
+   if (undef_bd<-1)
+   {   
+     stHNE(size(v))=stHNE(size(v))+" + ..... (terms of degree >="
+                                 +string(-undef_bd)+")";
+   }
+   if (undef_bd==-1)
+   {   
+     stHNE(size(v))=stHNE(size(v))+" + ..... (terms of degree >="
+                                 +string(colM+1)+")";
+   }
+
+   if (switch==0) {
+     stHNE(1) = "  "+string(var(size(v)+2))+" = "+stHNE(1);
+   } 
+   else {
+     stHNE(1) = "  "+string(var(size(v)+1))+" = "+stHNE(1);
+   }  
+   stHNE(1);
+   if (ncols(HNE)==1) {return();}
+
+   if (switch==0) {
+     stHNE(2) = "  "+string(var(size(v)+1))+" = "+stHNE(2); 
+   } 
+   else {
+     stHNE(2) = "  "+string(var(size(v)+2))+" = "+stHNE(2); 
+   }  
+   stHNE(2);
+
+   for (j=3; j<=ncols(HNE); j++){
+     stHNE(j)= "  "+"z(" +string(j-2)+ ") = "+stHNE(j); 
+     stHNE(j);
+   }
+   return();
+ }
+
+ if (rowM<2) { HNE[2]=z(0); }
+
  if (switch==0) {
     HNE[1] = HNE[1]-var(size(v)+2);
@@ -2617 +2676 @@
  {
    if(system("with","Namespaces")) { kill Top::extdguenstig; }
-   if (defined(extdguenstig)) {kill extdguenstig; }
+   kill extdguenstig;
  }
 
@@ -2843 +2902 @@
  //--- Falls Ring (0,a),... + minpoly : solange factorize nicht in Singular ---
  //------- implementiert ist, develop aufrufen (kann spaeter entfallen) -------
-   if ((char(basering)==0) && (npars(basering)==1)) {
-     if (string(minpoly)<>"0") { irred=1; }
-   }
+ //
+ // **** lossen: gestrichen 08/05  ****
+ //   if ((char(basering)==0) && (npars(basering)==1)) {
+ //     if (string(minpoly)<>"0") { irred=1; }
+ //   }
+ //
  //------------------ Aufruf der geeigneten Prozedur --------------------------
    if (irred==0) {
@@ -3881 +3943 @@
   }
   keepring basering;
-  if (system("with","Namespaces"))
-  {
-    if (defined(transfproc)) { return(list(HNEs,transfproc)); }
-    else                     { return(list(HNEs,poly(-1))); }
-  }
-  else
-  {
-    if (defined(transfproc)) { return(list(HNEs,transfproc)); }
-    else                     { return(list(HNEs,poly(-1))); }
-  }
+  if (defined(transfproc)) { return(list(HNEs,transfproc)); }
+  else                     { return(list(HNEs,poly(-1))); }
  // -1 als 2. Rueckgabewert zeigt an, dass kein Ringwechsel stattgefunden hat -
  }