Changeset 0291940 in git

Timestamp:

Oct 8, 2010, 12:14:28 PM (14 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', '38077648e7239f98078663eb941c3c979511150a')

Children:

87ee9b164257c151ff65e88084e1964ad3138011

Parents:

6e45c119f7dae5d56d3bdbc0441f758aef1380a0

Message:

some syntax fixes

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

File:

• Singular/LIB/resbin.lib (modified) (12 diffs)

Singular/LIB/resbin.lib

@@ -2 +2 @@
 ////////////////////////////////////////////////////////////////////////////
 version="$Id: resbin.lib$";
-category="Commutative algebra";
+category="Resolution of singularities";
 info="
 LIBRARY: resbin.lib    Combinatorial algorithm of resolution of singularities
@@ -11 +11 @@
 @*        G. Pfister,           pfister@mathematik.uni-kl.de
 
-SEE ALSO: resolve_lib
-
 PROCEDURES:
  BINresol(J);      computes a E-resolution of singularities of (J) (THE SECOND PART IS NOT IMPLEMENTED YET)
+
  Eresol(J);                         computes a E-resolution of singularities of (J) in char 0
  determinecenter(L1,L2,c,n,Y,a,mb,flag,control3);    computes the next blowing-up center
  Blowupcenter(L1,id,m,L2,c,n,h);    makes the blowing-up
  Nonhyp(Coef,expJ,sJ,n,flag,sums);  computes the ideal generated by the non hyperbolic generators of expJ
+
  inidata(K,k);                      verifies input data, a binomial ideal K of k generators
  identifyvar();                     identifies status of variables
@@ -35 +35 @@
  Maxord(L,n);                       computes the maximum exponent of an exceptional monomial ideal
  Gamma(L,c,n);                      computes the Gamma function for an exceptional monomial ideal given by L
+
  convertdata(C,L,n,flag);           computes the ideal corresponding to C,L
- tradblwup(blwhist,n,Y,a,num);      composes the blowing up at this chart
  lcmofall(nchart,mobile);           computes the lcm of the denominators of the E-orders for all the charts
  computemcm(Eolist);                computes the lcm of the denominators of the E-orders for one chart
+
  constructH(Hhist,n,flag);                construct the list of exceptional divisors accumulated at this chart
  constructblwup(blwhist,n,chy,flag);      construct the ideal defining the map K[W] --> K[Wi],
                                           which gives the composition map of all the blowing up leading to this chart
  constructlastblwup(blwhist,n,chy,flag);  construct the ideal defining the last blowup leading to this chart
+
  genoutput(chart,mobile,nchart,nsons,n,q,p);             generates the output for visualization
  salida(idchart,chart,mobile,numson,previousa,n,q);      generates the output for one chart
+
  iniD(n);                           creates a list of lists of zeros of size n
  sumlist(L1,L2);                    sums two lists component to component
@@ -52 +55 @@
  createlist(L1,L2);                 creates a list of lists of two elements
  list0(n);                          creates a list of zeros of size n
-
 ";
 
@@ -2391 +2393 @@
 "
 {
-int idchart,parent;
-list auxlist,solvedrings,totalringlist,previousa;
-list auxlistenp,solvedringsenp,totalringenp;
+  int idchart,parent;
+  list auxlist,solvedrings,totalringlist,previousa;
+  list auxlistenp,solvedringsenp,totalringenp;
 
 // chart gives: parent,Y,a,expJ,Coef,flag,Hhist,blwhist,path,hipercoef,hiperexp
 // mobile gives: tip,oldOlist,oldC,oldt,oldD,oldH,allH,infobo7;  NOTE: Eolist=mobile[2];
 
-idchart=1;
+  idchart=1;
 
 // first loop, construct list previousa
 
-while (idchart<=nchart)
-{
-if (idchart==1){previousa[1]=chart[2][3];}
-
-else{
-
+  while (idchart<=nchart)
+  {
+    if (idchart==1){previousa[1]=chart[2][3];}
+    else
+    {
 // if there are no sons, the next center is nothing
-
-     if (nsons[idchart]==0){previousa[idchart]=0;}
-
+      if (nsons[idchart]==0){previousa[idchart]=0;}
 // always fill the parent
-
-     parent=chart[idchart][1];
-     previousa[parent]=chart[idchart][3];
-     }
-idchart=idchart+1;
-}
-
+      parent=chart[idchart][1];
+      previousa[parent]=chart[idchart][3];
+    }
+    idchart=idchart+1;
+  }
 // HERE BEGIN THE LOOP
-
-idchart=1;
-
-while (idchart<=nchart)
-{
-
-def auxexit=salida(idchart,chart[idchart],mobile[idchart+1],nsons[idchart],previousa[idchart],n,q,p);
-
-if (p>0){ // we need the computations in char 0 too
-         def auxexitenp=salida(idchart,chart[idchart],mobile[idchart+1],nsons[idchart],previousa[idchart],n,q,0);
-        }
-else{def auxexitenp=auxexit;}
-
+  idchart=1;
+  while (idchart<=nchart)
+  {
+    def auxexit=salida(idchart,chart[idchart],mobile[idchart+1],nsons[idchart],previousa[idchart],n,q,p);
+    if (p>0)
+    { // we need the computations in char 0 too
+      def auxexitenp=salida(idchart,chart[idchart],mobile[idchart+1],nsons[idchart],previousa[idchart],n,q,0);
+    }
+    else{def auxexitenp=auxexit;}
 // we add the ring to the list of all rings
-
-auxlist[1]=auxexit;
-totalringlist=totalringlist+auxlist;
-
-auxlistenp[1]=auxexitenp;
-totalringenp=totalringenp+auxlistenp;
-
+    auxlist[1]=auxexit;
+    totalringlist=totalringlist+auxlist;
+    auxlistenp[1]=auxexitenp;
+    totalringenp=totalringenp+auxlistenp;
 // if the chart has no sons, add it to the list of final charts
-
-if (nsons[idchart]==0){solvedrings=solvedrings+auxlist;
-                       solvedringsenp=solvedringsenp+auxlistenp;
-                      }
-
-auxlist=list();
-auxlistenp=list();
-kill auxexit;
-kill auxexitenp;
-
-idchart=idchart+1;
-
-} // EXIT WHILE
-
-return(solvedrings,totalringlist,solvedringsenp,totalringenp);
+    if (nsons[idchart]==0)
+    {
+      solvedrings=solvedrings+auxlist;
+      solvedringsenp=solvedringsenp+auxlistenp;
+    }
+    auxlist=list();
+    auxlistenp=list();
+    kill auxexit;
+    kill auxexitenp;
+    idchart=idchart+1;
+  } // EXIT WHILE
+  return(solvedrings,totalringlist,solvedringsenp,totalringenp);
 }
 example
@@ -2484 +2471 @@
 "
 {
-int m,i,aux,mcmchart;
-intvec num;
-
-m=size(Eolist);
-
-if (m==1){mcmchart=int(denominator(Eolist[1])); return(mcmchart);}
-
-if (m>1){num=int(denominator(Eolist[1]));
-         for (i=2;i<=m;i++){aux=int(denominator(Eolist[i]));
-                            num=num,aux; }}
-
-mcmchart=lcm(num);
-
-return(mcmchart);
+  int m,i,aux,mcmchart;
+  intvec num;
+  m=size(Eolist);
+  if (m==1){mcmchart=int(denominator(Eolist[1])); return(mcmchart);}
+  if (m>1)
+  {
+    num=int(denominator(Eolist[1]));
+    for (i=2;i<=m;i++)
+    {aux=int(denominator(Eolist[i])); num=num,aux; }
+  }
+  mcmchart=lcm(num);
+  return(mcmchart);
 }
 example
@@ -2517 +2502 @@
 "
 {
-int i,j,m,l;
-list exceplist;
-ideal aux;
-
-m=size(Hhist);
-if (Hhist[1]==0 and m>1){Hhist=Hhist[2..m]; m=m-1;
-
-                         for (i=1;i<=m;i++){
-                                            l=Hhist[i];
-                                            if (flag[l]==0){aux=ideal(poly(x(l))); }
-                                            else {aux=ideal(poly(y(l))); }
-
-                                            exceplist[i]=aux;
-                                            }
+  int i,j,m,l;
+  list exceplist;
+  ideal aux;
+  m=size(Hhist);
+  if (Hhist[1]==0 and m>1)
+  {
+    Hhist=Hhist[2..m]; m=m-1;
+    for (i=1;i<=m;i++)
+    {
+      l=Hhist[i];
+      if (flag[l]==0){aux=ideal(poly(x(l))); }
+      else {aux=ideal(poly(y(l))); }
+      exceplist[i]=aux;
+    }
 // eliminate repeated variables
-for (i=1;i<=m;i++){for (j=1;j<=m;j++){
-                                      if (Hhist[i]==Hhist[j] and i!=j){
-                                                                       if (i<j){exceplist[i]=ideal(1);}
-                                                                       if (i>j){exceplist[j]=ideal(1);}
-                                                                      }
-                                     }
-                  }
-
-                         }
-else  {exceplist=list();}
-
+    for (i=1;i<=m;i++)
+    {
+      for (j=1;j<=m;j++)
+      {
+        if (Hhist[i]==Hhist[j] and i!=j)
+        {
+          if (i<j){exceplist[i]=ideal(1);}
+          if (i>j){exceplist[j]=ideal(1);}
+        }
+      }
+    }
+  }
+  else  {exceplist=list();}
 // else  {exceplist=list(ideal(0));} // IF IT FAILS USE THIS
-
-return(exceplist);
+  return(exceplist);
 }
 example
@@ -2556 +2542 @@
   L[1][7][7]; // blow ups at x(3)-th, x(1)-th and x(1)-th charts
   constructH(L[1][7][7],3,flag);
-
 }
 /////////////////////////////////////////////////////////////////////
@@ -2569 +2554 @@
 "
 {
-int i,j,m,m2;
-poly aux2;
-
-m=size(blwhist[1]);
-
-for (j=1;j<=m;j++){
-                   for (i=1;i<=n;i++){ m2=blwhist[i][j];
-
+  int i,j,m,m2;
+  poly aux2;
+
+  m=size(blwhist[1]);
+
+  for (j=1;j<=m;j++)
+  {
+    for (i=1;i<=n;i++)
+    {
+      m2=blwhist[i][j];
 // If m2!=0 this variable changes. First decide if the variable to multiply is invertible or not
-
-                                       if  (m2!=0){
-                                                  if (flag[m2]==0){aux2=poly(x(m2));}
-                                                  else {aux2=poly(y(m2));}
-
+      if  (m2!=0)
+      {
+        if (flag[m2]==0){aux2=poly(x(m2));}
+        else {aux2=poly(y(m2));}
 // And then substitute this variable for the corresponding product in the whole ideal
-
-                                                  if (flag[i]==0){chy=subst(chy,x(i),x(i)*aux2);}
-                                                  else {chy=subst(chy,y(i),y(i)*aux2);}
-
-                                                  }
-                                      }
-
-                   }
-
-return(chy);
+        if (flag[i]==0){chy=subst(chy,x(i),x(i)*aux2);}
+        else {chy=subst(chy,y(i),y(i)*aux2);}
+      }
+    }
+  }
+  return(chy);
 }
 example
@@ -2616 +2598 @@
 "
 {
-int i,j,m,m2;
-poly aux2;
-
-m=size(blwhist[1]);
-
-if (m>0){
-for (i=1;i<=n;i++){ m2=blwhist[i][m];
-
-// If m2!=0 this variable changes. First decide if the variable to multiply is invertible or not
-
-                                       if  (m2!=0){
-                                                  if (flag[m2]==0){aux2=poly(x(m2));}
-                                                  else {aux2=poly(y(m2));}
+  int i,j,m,m2;
+  poly aux2;
+  m=size(blwhist[1]);
+
+  if (m>0)
+  {
+    for (i=1;i<=n;i++){ m2=blwhist[i][m];
+
+    // If m2!=0 this variable changes. First decide if the variable to multiply is invertible or not
+
+    if  (m2!=0)
+    {
+      if (flag[m2]==0){aux2=poly(x(m2));}
+      else {aux2=poly(y(m2));}
 
 // And then substitute this variable for the corresponding product in the whole ideal
 
-                                                  if (flag[i]==0){chy=subst(chy,x(i),x(i)*aux2);}
-                                                  else {chy=subst(chy,y(i),y(i)*aux2);}
-
-                                                  }
-                  }
+      if (flag[i]==0){chy=subst(chy,x(i),x(i)*aux2);}
+      else {chy=subst(chy,y(i),y(i)*aux2);}
+    }
+  }
 }
 
@@ -2662 +2644 @@
 "
 {
-int i,m;
-ideal acenter,aux2;
-
-if (a==0){acenter=J2;}
-else{
-     m=size(a);
-     for (i=1;i<=m;i++){
-                        if (flag[a[i]]==0){aux2=poly(x(a[i]));}
-                        else {aux2=poly(y(a[i]));}
-
-                        acenter=acenter+aux2;
-                        }
+  int i,m;
+  ideal acenter,aux2;
+
+  if (a==0)
+  {acenter=J2;}
+  else
+  {
+    m=size(a);
+    for (i=1;i<=m;i++)
+    {
+      if (flag[a[i]]==0){aux2=poly(x(a[i]));}
+      else {aux2=poly(y(a[i]));}
+
+      acenter=acenter+aux2;
     }
+  }
 return(acenter);
 }
@@ -2689 +2674 @@
 //////////////////////////////////////////////////////////////////////////////////////
 
- proc iniD(int n)
+proc iniD(int n)
 "USAGE: iniD(n);   n integer
 RETURN: list of lists of zeros of size n