Changeset 8ed7dc in git for Singular/dyn_modules/gfanlib/bbpolytope.cc

Timestamp:

Jan 16, 2017, 9:48:18 AM (7 years ago)

Author:

Hans Schoenemann <hannes@…>

Branches:

(u'spielwiese', 'fe61d9c35bf7c61f2b6cbf1b56e25e2f08d536cc')

Children:

16e290ed6ed9a361fef149bc33d0b55909b2273e

Parents:

2094fad4a01ad43e18993abc6366ff6b1ddb4fed5a1c7862e21daad552fae4eb1c7ac09cf3209280

git-author:

Hans Schoenemann <hannes@mathematik.uni-kl.de>2017-01-16 09:48:18+01:00

git-committer:

GitHub <noreply@github.com>2017-01-16 09:48:18+01:00

Message:

Merge pull request #812 from YueRen/cddDeinitialize

fix: proper deinitialization of cddlib global variables

File:

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

Singular/dyn_modules/gfanlib/bbpolytope.cc

@@ -185 +185 @@
 BOOLEAN polytopeViaVertices(leftv res, leftv args)
 {
-  gfan::initializeCddlibIfRequired();
   leftv u = args;
   if ((u != NULL) && ((u->Typ() == BIGINTMAT_CMD) || (u->Typ() == INTMAT_CMD)))
   {
-    if (u->next == NULL) return ppCONERAYS1(res, u);
+    if (u->next == NULL)
+    {
+      gfan::initializeCddlibIfRequired();
+      BOOLEAN bo = ppCONERAYS1(res, u);
+      gfan::deinitializeCddlibIfRequired();
+      return bo;
+    }
     leftv v = u->next;
     if ((v != NULL) && (v->Typ() == INT_CMD))
     {
-      if (v->next == NULL) return ppCONERAYS3(res, u, v);
+      if (v->next == NULL)
+      {
+        gfan::initializeCddlibIfRequired();
+        BOOLEAN bo = ppCONERAYS3(res, u, v);
+        gfan::deinitializeCddlibIfRequired();
+        return bo;
+      }
     }
   }
@@ -320 +331 @@
 BOOLEAN polytopeViaNormals(leftv res, leftv args)
 {
-  gfan::initializeCddlibIfRequired();
   leftv u = args;
   if ((u != NULL) && ((u->Typ() == BIGINTMAT_CMD) || (u->Typ() == INTMAT_CMD)))
   {
-    if (u->next == NULL) return ppCONENORMALS1(res, u);
+    if (u->next == NULL)
+    {
+      gfan::initializeCddlibIfRequired();
+      BOOLEAN bo = ppCONENORMALS1(res, u);
+      gfan::deinitializeCddlibIfRequired();
+      return bo;
+    }
   }
   leftv v = u->next;
   if ((v != NULL) && ((v->Typ() == BIGINTMAT_CMD) || (v->Typ() == INTMAT_CMD)))
   {
-    if (v->next == NULL) return ppCONENORMALS2(res, u, v);
+    if (v->next == NULL)
+    {
+      gfan::initializeCddlibIfRequired();
+      BOOLEAN bo = ppCONENORMALS2(res, u, v);
+      gfan::deinitializeCddlibIfRequired();
+      return bo;
+    }
   }
   leftv w = v->next;
   if ((w != NULL) && (w->Typ() == INT_CMD))
   {
-    if (w->next == NULL) return ppCONENORMALS3(res, u, v, w);
+    if (w->next == NULL)
+    {
+      gfan::initializeCddlibIfRequired();
+      BOOLEAN bo = ppCONENORMALS3(res, u, v, w);
+      gfan::deinitializeCddlibIfRequired();
+      return bo;
+    }
   }
   WerrorS("polytopeViaInequalities: unexpected parameters");
@@ -342 +370 @@
 BOOLEAN vertices(leftv res, leftv args)
 {
-  gfan::initializeCddlibIfRequired();
   leftv u = args;
   if ((u != NULL) && (u->Typ() == polytopeID))
-    {
-      gfan::ZCone* zc = (gfan::ZCone*)u->Data();
-      gfan::ZMatrix zmat = zc->extremeRays();
-      res->rtyp = BIGINTMAT_CMD;
-      res->data = (void*)zMatrixToBigintmat(zmat);
-      return FALSE;
-    }
+  {
+    gfan::initializeCddlibIfRequired();
+    gfan::ZCone* zc = (gfan::ZCone*)u->Data();
+    gfan::ZMatrix zmat = zc->extremeRays();
+    res->rtyp = BIGINTMAT_CMD;
+    res->data = (void*)zMatrixToBigintmat(zmat);
+    gfan::deinitializeCddlibIfRequired();
+    return FALSE;
+  }
   WerrorS("vertices: unexpected parameters");
   return TRUE;
@@ -401 +430 @@
 BOOLEAN newtonPolytope(leftv res, leftv args)
 {
-  gfan::initializeCddlibIfRequired();
   leftv u = args;
   if ((u != NULL) && (u->Typ() == POLY_CMD))
   {
+    gfan::initializeCddlibIfRequired();
     poly p = (poly)u->Data();
     res->rtyp = polytopeID;
     res->data = (void*) new gfan::ZCone(newtonPolytope(p,currRing));
+    gfan::deinitializeCddlibIfRequired();
     return FALSE;
   }
@@ -416 +446 @@
 BOOLEAN scalePolytope(leftv res, leftv args)
 {
-  gfan::initializeCddlibIfRequired();
   leftv u = args;
   if ((u != NULL) && (u->Typ() == INT_CMD))
@@ -423 +452 @@
     if ((v != NULL) && (v->Typ() == polytopeID))
     {
+      gfan::initializeCddlibIfRequired();
       int s = (int)(long) u->Data();
       gfan::ZCone* zp = (gfan::ZCone*) v->Data();
@@ -433 +463 @@
       res->rtyp = polytopeID;
       res->data = (void*) zq;
+      gfan::deinitializeCddlibIfRequired();
       return FALSE;
     }
@@ -442 +473 @@
 BOOLEAN dualPolytope(leftv res, leftv args)
 {
-  gfan::initializeCddlibIfRequired();
   leftv u = args;
   if ((u != NULL) && (u->Typ() == polytopeID))
   {
+    gfan::initializeCddlibIfRequired();
     gfan::ZCone* zp = (gfan::ZCone*) u->Data();
     gfan::ZCone* zq = new gfan::ZCone(zp->dualCone());
     res->rtyp = polytopeID;
     res->data = (void*) zq;
+    gfan::deinitializeCddlibIfRequired();
     return FALSE;
   }
@@ -458 +490 @@
 BOOLEAN mixedVolume(leftv res, leftv args)
 {
-  gfan::initializeCddlibIfRequired();
   leftv u = args;
   if ((u != NULL) && (u->Typ() == LIST_CMD))
   {
+    gfan::initializeCddlibIfRequired();
     lists l = (lists) u->Data();
     int k = lSize(l)+1;
@@ -499 +531 @@
       {
         WerrorS("mixedVolume: entries of unsupported type in list");
+        gfan::deinitializeCddlibIfRequired();
         return TRUE;
       }
@@ -506 +539 @@
     res->rtyp = BIGINT_CMD;
     res->data = (void*) integerToNumber(mv);
+    gfan::deinitializeCddlibIfRequired();
     return FALSE;
   }