Changeset 1941b8 in git

Timestamp:

Aug 3, 2016, 4:27:18 PM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', '8d54773d6c9e2f1d2593a28bc68b7eeab54ed529')

Children:

5482369543823873f05f2b2bf641804948bc2e5b

Parents:

bd9a41c240f0853fddef3cce8d80f2d7077b36c8

Message:

fix: tr. #768 by Thomas Markwig

Files:

• Singular/LIB/alexpoly.lib (modified) (8 diffs)
• Tst/Short/bug_tr768.res.gz.uu (added)
• Tst/Short/bug_tr768.stat (added)
• Tst/Short/bug_tr768.tst (added)
• Tst/Short/ok_s.lst (modified) (1 diff)

Singular/LIB/alexpoly.lib

@@ -125 +125 @@
   intmat helpmati,helpmatii;
   intvec helpvec;
+  int inputispoly=0;
   /////////////////////////////////////////////////////////////////////////////////
   // Decide, which kind of input we have, and define the contact matrix
@@ -142 +143 @@
     */
     list I@N@V=invariants(INPUT);
+    inputispoly=1;
   }
   else
@@ -313 +315 @@
   }
   /////////////////////////////////////////////////////////////////////////////////////
-  // Sort the branches in such a way, that in the blowing up procedure whenever to branches
+  // Sort the branches in such a way, that in the blowing up procedure whenever two branches
   // C_i and C_j have contact k (i.e. after k steps they are separated) and one of the following
   // situations occurs:
@@ -359 +361 @@
   int n_i,n_j;
   int bad_contact;
+  list newpos;  // when reordering the branches, here we save the new order of the old branches
+  for (ii=1;ii<=r;ii++)
+  {
+    newpos[ii]=ii;
+  }
   while (i<r)
   {
@@ -412 +419 @@
       bad_contact=1;
       // Move the graph (etc.) of C_j into the position i.
+      newpos=insert(newpos,j,i-1);
+      newpos=delete(newpos,j+1);
       graphs=insert(graphs,graphs[j],i-1);
       graphs=delete(graphs,j+1);
@@ -559 +568 @@
     }
   }
-  list result=rgraph,rtm,rmt;
-  return(result);
+  if (inputispoly==1) // if the input was a polynomial the ordering of the branches is fine
+  {
+    list result=rgraph,rtm,rmt;
+    return(result);
+  }
+  else // reorder the branches according to the ordering of the input
+  {
+    // reordered total multiplicities, multiplicities and resolution graph
+    intmat rtmro[nrows(rtm)][ncols(rtm)];
+    intmat rmtro[nrows(rmt)][ncols(rmt)];
+    intmat rgraphro=rgraph;
+    for (i=1;i<=r;i++)
+    {
+      rtmro[1..nrows(rtm),newpos[i]]=rtm[1..nrows(rtm),i];
+      rmtro[1..nrows(rmt),newpos[i]]=rmt[1..nrows(rmt),i];
+      for (j=1;j<=nrows(rgraph);j++)
+      {
+        if (rgraph[j,j]==-i)
+        {
+          rgraphro[j,j]=-newpos[i];
+        }
+      }
+    }
+    list result=rgraphro,rtmro,rmtro;
+    return(result);
+  }
 }
 example
@@ -835 +868 @@
     intmat intersecmult=I@N@V[size(I@N@V)][2];   // intersection multiplicities
     for(i=1;i<=n;i++)
-        {
-          conductor[i]=I@N@V[i][5];
+    {
+      conductor[i]=I@N@V[i][5];
       charexp[i]=I@N@V[i][1];
-        }
+    }
   }
   /////////////////////////////////////////////////////////////////////////////////////
@@ -848 +881 @@
   {
     for(j=1;j<=size(conductor);j++)
-        {
-          conductor[i]=conductor[i]+intersecmult[i,j];
-        }
+    {
+      conductor[i]=conductor[i]+intersecmult[i,j];
+    }
   }
   /////////////////////////////////////////////////////////////////////////////////////

Tst/Short/ok_s.lst

@@ -62 +62 @@
 bug_tr760_761
 bug_tr767
+bug_tr768
 bug_genus_etc
 conv_bi