Changeset 300563 in git


Ignore:
Timestamp:
Aug 15, 2016, 12:01:20 PM (8 years ago)
Author:
Hans Schoenemann <hannes@…>
Branches:
(u'spielwiese', '5b153614cbc72bfa198d75b1e9e33dab2645d9fe')
Children:
bd183cd19d2214ef4634e2c81658a8730a93059e
Parents:
e009effbfaa9d4f42b1ec6659250bc3481449fb5
Message:
Revert "fix: tr. #768 by Thomas Markwig"

This reverts commit 1941b83b2fcbbef848fd4975c0409310bd714f15.
Files:
3 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • Singular/LIB/alexpoly.lib

    re009ef r300563  
    125125  intmat helpmati,helpmatii;
    126126  intvec helpvec;
    127   int inputispoly=0;
    128127  /////////////////////////////////////////////////////////////////////////////////
    129128  // Decide, which kind of input we have, and define the contact matrix
     
    143142    */
    144143    list I@N@V=invariants(INPUT);
    145     inputispoly=1;
    146144  }
    147145  else
     
    315313  }
    316314  /////////////////////////////////////////////////////////////////////////////////////
    317   // Sort the branches in such a way, that in the blowing up procedure whenever two branches
     315  // Sort the branches in such a way, that in the blowing up procedure whenever to branches
    318316  // C_i and C_j have contact k (i.e. after k steps they are separated) and one of the following
    319317  // situations occurs:
     
    361359  int n_i,n_j;
    362360  int bad_contact;
    363   list newpos;  // when reordering the branches, here we save the new order of the old branches
    364   for (ii=1;ii<=r;ii++)
    365   {
    366     newpos[ii]=ii;
    367   }
    368361  while (i<r)
    369362  {
     
    419412      bad_contact=1;
    420413      // Move the graph (etc.) of C_j into the position i.
    421       newpos=insert(newpos,j,i-1);
    422       newpos=delete(newpos,j+1);
    423414      graphs=insert(graphs,graphs[j],i-1);
    424415      graphs=delete(graphs,j+1);
     
    568559    }
    569560  }
    570   if (inputispoly==1) // if the input was a polynomial the ordering of the branches is fine
    571   {
    572     list result=rgraph,rtm,rmt;
    573     return(result);
    574   }
    575   else // reorder the branches according to the ordering of the input
    576   {
    577     // reordered total multiplicities, multiplicities and resolution graph
    578     intmat rtmro[nrows(rtm)][ncols(rtm)];
    579     intmat rmtro[nrows(rmt)][ncols(rmt)];
    580     intmat rgraphro=rgraph;
    581     for (i=1;i<=r;i++)
    582     {
    583       rtmro[1..nrows(rtm),newpos[i]]=rtm[1..nrows(rtm),i];
    584       rmtro[1..nrows(rmt),newpos[i]]=rmt[1..nrows(rmt),i];
    585       for (j=1;j<=nrows(rgraph);j++)
    586       {
    587         if (rgraph[j,j]==-i)
    588         {
    589           rgraphro[j,j]=-newpos[i];
    590         }
    591       }
    592     }
    593     list result=rgraphro,rtmro,rmtro;
    594     return(result);
    595   }
     561  list result=rgraph,rtm,rmt;
     562  return(result);
    596563}
    597564example
     
    868835    intmat intersecmult=I@N@V[size(I@N@V)][2];   // intersection multiplicities
    869836    for(i=1;i<=n;i++)
    870     {
    871       conductor[i]=I@N@V[i][5];
     837        {
     838          conductor[i]=I@N@V[i][5];
    872839      charexp[i]=I@N@V[i][1];
    873     }
     840        }
    874841  }
    875842  /////////////////////////////////////////////////////////////////////////////////////
     
    881848  {
    882849    for(j=1;j<=size(conductor);j++)
    883     {
    884       conductor[i]=conductor[i]+intersecmult[i,j];
    885     }
     850        {
     851          conductor[i]=conductor[i]+intersecmult[i,j];
     852        }
    886853  }
    887854  /////////////////////////////////////////////////////////////////////////////////////
  • Tst/Short/ok_s.lst

    re009ef r300563  
    6262bug_tr760_761
    6363bug_tr767
    64 bug_tr768
    6564bug_genus_etc
    6665conv_bi
Note: See TracChangeset for help on using the changeset viewer.