Changeset e324f51 in git

Timestamp:

Nov 16, 2020, 8:17:03 PM (4 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'fieker-DuVal', '117eb8c30fc9e991c4decca4832b1d19036c4c65')(u'spielwiese', 'b4f17ed1d25f93d46dbe29e4b499baecc2fd51bb')

Children:

93071995c509c3daf345991ea24275045205d604

Parents:

7f4475eb5b248c52cbad0428d40629dab16db64a2629de36e042e643d9a0d27aaae21641614f5e22

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2020-11-16 20:17:03+01:00

git-committer:

GitHub <noreply@github.com>2020-11-16 20:17:03+01:00

Message:

Merge pull request #1031 from YueRen/gitfanBug

fix: bug reported by Donton-Bury and Grab

Files:

• Singular/LIB/gitfan.lib (modified) (3 diffs)
• doc/letterplace.doc (modified) (previous)
• doc/singular.doc (modified) (previous)
• doc/types.doc (modified) (previous)
• factory/cf_chinese.cc (modified) (1 diff)

Singular/LIB/gitfan.lib

@@ -985 +985 @@
 "
 {
-  cone Qgammadual = coneViaInequalities(transpose(Q));
-  bigintmat R = facets(Qgammadual);
-  list idx1=intvecToList(intvec(1..nrows(R)));
-  intvec idx2=1..ncols(R);
-  intvec idx1iv;
-  bigintmat Ri[nrows(R)-1][ncols(R)];
-  list C;
-  for (int i = 1; i<=nrows(R);i++){
-    idx1iv = listToIntvec(delete(idx1,i));
-    Ri=R[idx1iv,idx2];
-    C[i]=coneViaPoints(Ri);
-    dbprint(string(i)+"   "+string(nrows(facets(C[i]))));
+  // Check whether the cone generated by the columns of Q is pointed:
+  intmat Qt = transpose(Q);
+  cone CQ = coneViaPoints(Qt);
+  if (dimension(convexIntersection(CQ,negatedCone(CQ)))==0)
+  {
+    // The following old code assumes that
+    // the cone generated by the columns of Q is pointed:
+    cone Qgammadual = coneViaInequalities(Qt);
+    bigintmat R = facets(Qgammadual);
+    list idx1=intvecToList(intvec(1..nrows(R)));
+    intvec idx2=1..ncols(R);
+    intvec idx1iv;
+    bigintmat Ri[nrows(R)-1][ncols(R)];
+    list C;
+    for (int i = 1; i<=nrows(R);i++){
+      idx1iv = listToIntvec(delete(idx1,i));
+      Ri=R[idx1iv,idx2];
+      C[i]=coneViaPoints(Ri);
+      dbprint(string(i)+"   "+string(nrows(facets(C[i]))));
+    }
+  }
+  else
+  {
+    // The following code works always but is generally slower:
+    list C;
+    for (int i=1; i<=nrows(Qt); i++)
+    {
+      intmat Qdash[nrows(Qt)-1][ncols(Qt)];
+      for (int j=1; j<i; j++)
+      {
+        Qdash[j,1..ncols(Qt)] = Qt[j,1..ncols(Qt)];
+      }
+      for (int j=i+1; j<=nrows(Qt); j++)
+      {
+        Qdash[j-1,1..ncols(Qt)] = Qt[j,1..ncols(Qt)];
+      }
+      C[i] = coneViaPoints(Qdash);
+    }
   }
   cone mov = convexIntersection(C);
@@ -1010 +1036 @@
     0, 1, 0, 1, 0, -1, 0, 0, 1, 0,
     0, 0, 1, 1, -1, 0, 0, 0, 0, 1;
+  cone mov = movingCone(Q);
+  mov;
+  rays(mov);
+
+  // moving cone where the image of the positive orthant
+  // is the entire space
+  // (from bug reported by Donton-Bury and Grab)
+  intmat Q[3][16] =
+    7, 7,7,7, 7,7,7, 7,7,7, 7,7,7, -7,0,0,
+    0, 0,2,1, 0,2,1, 3,2,1, 3,2,4, 0,-3,0,
+    0, 0,1,2, 0,1,2, 3,1,2, 3,4,2, 0,0,-3;
   cone mov = movingCone(Q);
   mov;
@@ -3092 +3129 @@
   orbitConesOld(a, Q);
 }
-

factory/cf_chinese.cc

@@ -256 +256 @@
 #else
           if (c.inZ())
-            result += power (x, i.exp()) * Farey_n(c,q);
+            result += power (x, i.exp()) * Farey_n(c,q);
 #endif
           else