Changeset fbaeb5 in git

Timestamp:

Aug 5, 2016, 12:24:51 PM (7 years ago)

Author:

Yue <ren@…>

Branches:

(u'spielwiese', '828514cf6e480e4bafc26df99217bf2a1ed1ef45')

Children:

f73b0dba8fd582e1ebf4d2a1ed2067a19cab5a36

Parents:

5cea7ad489a20fb756363be9d41e8e6955b5835f

git-author:

Yue <ren@mathematik.uni-kl.de>2016-08-05 12:24:51+02:00

git-committer:

Yue <ren@mathematik.uni-kl.de>2016-08-05 18:10:20+02:00

Message:

fix: mixedVolume small mistakes

File:

• Singular/dyn_modules/gfanlib/bbpolytope.cc (modified) (6 diffs)

Singular/dyn_modules/gfanlib/bbpolytope.cc

@@ -385 +385 @@
 {
   int N = rVar(r);
-  gfan::ZMatrix zm(1,N+1);
+  gfan::ZMatrix zm(0,N+1);
   int *leadexpv = (int*)omAlloc((N+1)*sizeof(int));
   while (p!=NULL)
@@ -395 +395 @@
   }
   omFreeSize(leadexpv,(N+1)*sizeof(int));
-  return gfan::ZCone();
+  gfan::ZCone Delta = gfan::ZCone::givenByRays(zm,gfan::ZMatrix(0, zm.getWidth()));
+  return Delta;
 }
 
@@ -466 +467 @@
     for (int i=0; i<k; i++)
     {
-      if (l->m[i].Typ() != polytopeID)
+      if (l->m[i].Typ() == polytopeID)
       {
         gfan::ZCone* p = (gfan::ZCone*) l->m[i].Data();
@@ -472 +473 @@
         int r = pv.getHeight();
         int c = pv.getWidth();
-        gfan::IntMatrix pw(c,r);
-        for (int n=0; n<c; n++)
-          for (int m=0; m<r; m++)
-          {
-            pw[n][m] = pv[m][n].toInt();
-          }
-        P[i]=pw;
-      } else if (l->m[i].Typ() != POLY_CMD)
+        gfan::IntMatrix pw(r,c-1);
+        for (int n=0; n<r; n++)
+          for (int m=1; m<c; m++)
+            pw[n][m-1] = pv[n][m].toInt();
+        P[i]=pw.transposed();
+      } else if (l->m[i].Typ() == POLY_CMD)
       {
         poly p = (poly) l->m[i].Data();
         int N = rVar(currRing);
-        gfan::IntMatrix pw(0,N+1);
+        gfan::IntMatrix pw(0,N);
         int *leadexpv = (int*)omAlloc((N+1)*sizeof(int));
         while (p!=NULL)
@@ -494 +493 @@
           pIter(p);
         }
-        P[i]=pw;
+        P[i]=pw.transposed();
         omFreeSize(leadexpv,(N+1)*sizeof(int));
       }
@@ -533 +532 @@
   p->iiAddCproc("","scalePolytope",FALSE,scalePolytope);
   p->iiAddCproc("","dualPolytope",FALSE,dualPolytope);
+  p->iiAddCproc("","mixedVolume",FALSE,mixedVolume);
   /********************************************************/
   /* the following functions are implemented in bbcone.cc */