Changeset 23a8f2 in git

Timestamp:

Oct 2, 2019, 10:32:01 AM (5 years ago)

Author:

Lars Kastner <lars.kastner@…>

Branches:

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

Children:

77dfcae13d7585d210b10b1088424b08f3c0b89d

Parents:

7bb884bac496cd610fead7507b236f5eff5796fe

Message:

Update polymake interface

Location:

Singular/dyn_modules/polymake

Files:

• polymake_conversion.cc (modified) (1 diff)
• polymake_wrapper.cc (modified) (12 diffs)

Singular/dyn_modules/polymake/polymake_conversion.cc

@@ -404 +404 @@
     for (int i=0; i<n; i++)
     {
-      polymake::perl::Object pmcone=pf->CallPolymakeMethod("cone",i);
+      polymake::perl::Object pmcone=pf->call_method("cone",i);
       gfan::ZCone* zc=PmCone2ZCone(&pmcone);
       zf->insert(*zc);

Singular/dyn_modules/polymake/polymake_wrapper.cc

@@ -12 +12 @@
 #include "Singular/mod_lib.h"
 
+#include <polymake/client.h>
 #include <polymake_conversion.h>
 #include <polymake_documentation.h>
@@ -35 +36 @@
           polymake::perl::Object* pq = ZPolytope2PmPolytope(zq);
           polymake::perl::Object pms;
-          CallPolymakeFunction("minkowski_sum", *pp, *pq) >> pms;
+          polymake::call_function("minkowski_sum", *pp, *pq) >> pms;
           ms = PmPolytope2ZPolytope(&pms);
           delete pp;
@@ -1064 +1065 @@
       polymake::perl::Object* p = ZPolytope2PmPolytope(zp);
       #if (POLYMAKEVERSION >=214)
-      polymake::Matrix<polymake::Integer> lp = p->CallPolymakeMethod("LATTICE_POINTS");
+      polymake::Matrix<polymake::Integer> lp = p->call_method("LATTICE_POINTS");
       #elif (POLYMAKEVERSION >=212)
       polymake::Matrix<polymake::Integer> lp = p->give("LATTICE_POINTS");
@@ -1292 +1293 @@
       polymake::perl::Object* p = ZPolytope2PmPolytope(zp);
       #if (POLYMAKEVERSION >=214)
-      polymake::Matrix<polymake::Integer> lp = p->CallPolymakeMethod("HILBERT_BASIS");
+      polymake::Matrix<polymake::Integer> lp = p->call_method("HILBERT_BASIS");
       #elif (POLYMAKEVERSION >=212)
       polymake::Matrix<polymake::Integer> lp = p->give("HILBERT_BASIS");
@@ -1376 +1377 @@
         polymake::perl::Object* pq = ZPolytope2PmPolytope(zq);
         polymake::perl::Object pms;
-        CallPolymakeFunction("minkowski_sum", *pp, *pq) >> pms;
+        polymake::call_function("minkowski_sum", *pp, *pq) >> pms;
         delete pp;
         delete pq;
@@ -1404 +1405 @@
         polymake::perl::Object* pq = ZPolytope2PmPolytope(zq);
         polymake::perl::Object pms;
-        CallPolymakeFunction("minkowski_sum", *pp, *pq) >> pms;
+        polymake::call_function("minkowski_sum", *pp, *pq) >> pms;
         delete pp;
         delete pq;
@@ -1438 +1439 @@
         polymake::perl::Object* pq = ZPolytope2PmPolytope(zq);
         polymake::perl::Object pms;
-        CallPolymakeFunction("minkowski_sum", *pp, *pq) >> pms;
+        polymake::call_function("minkowski_sum", *pp, *pq) >> pms;
         delete pp;
         delete pq;
@@ -1467 +1468 @@
         polymake::perl::Object* pq = ZPolytope2PmPolytope(zq);
         polymake::perl::Object pms;
-        CallPolymakeFunction("minkowski_sum", *pp, *pq) >> pms;
+        polymake::call_function("minkowski_sum", *pp, *pq) >> pms;
         delete pp;
         delete pq;
@@ -1495 +1496 @@
   polymake::Matrix<polymake::Integer> wantedrays;
   bool ok = true;
-  for(polymake::Entire<polymake::Set<polymake::Integer> >::const_iterator i=polymake::entire(*s); !i.at_end(); i++)
-  {
-    wantedrays = wantedrays / allrays.row(PmInteger2Int(*i,ok));
+  for(const auto i : *s)
+  {
+    wantedrays = wantedrays / allrays.row(PmInteger2Int(i,ok));
   }
   if (!ok)
@@ -1710 +1711 @@
     {
       polymake::perl::Object* pp = ZPolytope2PmPolytope(zp);
-      VoidCallPolymakeFunction("jreality",pp->CallPolymakeMethod("VISUAL"));
+      polymake::call_function("jreality",pp->call_method("VISUAL"));
       delete pp;
     }
@@ -1731 +1732 @@
     {
       polymake::perl::Object* pf=ZFan2PmFan(zf);
-      VoidCallPolymakeFunction("jreality",pf->CallPolymakeMethod("VISUAL"));
+      polymake::call_function("jreality",pf->call_method("VISUAL"));
     }
     catch (const std::exception& ex)
@@ -1760 +1761 @@
       polymake::perl::Object* p=ZPolytope2PmPolytope(zp);
       polymake::perl::Object pf;
-      CallPolymakeFunction("normal_fan", *p) >> pf;
+      polymake::call_function("normal_fan", *p) >> pf;
       delete p;
       zf = PmFan2ZFan(&pf);