Merge pull request #63 from oscar-system/bl/moretake

add more take methods

Author: benlorenz

.github/workflows/test-polymake.yml

@@ -27,7 +27,7 @@ jobs:
     strategy:
       matrix:
         os: [ubuntu-latest, macOS-latest]
-        julia-version: ['1.6', '~1.10.0-0', '~1.11.0-0', 'nightly']
+        julia-version: ['1.6', '~1.10.0-0', '~1.11.0-0', '1.12-nightly']
 
       fail-fast: false
 

OscarCI.toml

@@ -5,7 +5,7 @@ os = [ "ubuntu-latest", "macos-latest" ]
 # 1.6 is done with some extra combinations in include
 # also to avoid some weird behaviour by github actions which seems to merge
 # the includes with the normal matrix entries
-julia-version = [ "~1.10.0-0", "nightly" ]
+julia-version = [ "~1.10.0-0", "1.12-nightly" ]
 branches = [ "release", "<matching>" ]
 
 [pkgs]

include/jlpolymake/containers.h

@@ -624,7 +624,7 @@ struct WrapPolynomialBase
       wrapped.method("_add", [](const WrappedT& a, const WrappedT& b) { return a + b; });
       wrapped.method("_sub", [](const WrappedT& a, const WrappedT& b) { return a - b; });
       wrapped.method("_mul", [](const WrappedT& a, const WrappedT& b) { return a * b; });
-      wrapped.method("^", [](const WrappedT& a, int64_t b) { return a ^ b; });
+      wrapped.method("^", [](const WrappedT& a, int64_t b) { return a ^ static_cast<pm::Int>(b); });
       wrapped.method("/", [](const WrappedT& a, const coeffT& c) { return a / c; });
       wrapped.method("coefficients_as_vector", &WrappedT::coefficients_as_vector);
       wrapped.method("set_var_names", [](const WrappedT& a, const Array<std::string>& names) { a.set_var_names(names); });

include/jlpolymake/jlpolymake.h

@@ -44,7 +44,7 @@
 
 #define JLPOLYMAKE_VERSION_MAJOR 0
 #define JLPOLYMAKE_VERSION_MINOR 13
-#define JLPOLYMAKE_VERSION_PATCH 0
+#define JLPOLYMAKE_VERSION_PATCH 1
 
 #define __JLPOLYMAKE_STR_HELPER(x) #x
 #define __JLPOLYMAKE_STR(x) __JLPOLYMAKE_STR_HELPER(x)

src/polymake/type_setup.pl

@@ -255,10 +255,12 @@ sub EdgeMap {
         UniPolynomial(Int,Int),
         UniPolynomial(Integer,Int),
         UniPolynomial(Rational,Int),
+        UniPolynomial(Rational,Rational),
         UniPolynomial(QuadraticExtension(Rational),Int),
         Polynomial(Int,Int),
         Polynomial(Integer,Int),
         Polynomial(Rational,Int),
+        Polynomial(Rational,Rational),
         Polynomial(double,Int),
         Polynomial(QuadraticExtension(Rational),Int),
 

src/type_bigobject.cpp

@@ -120,6 +120,9 @@ void add_bigobject(jlcxx::Module& jlpolymake)
     });
     jlpolymake.method("take", [](pm::perl::BigObject& p, const std::string& s,
                                const std::string& t) { p.take(s) << t; });
+    jlpolymake.method("take",
+                    [](pm::perl::BigObject& p, const std::string& s,
+                       double n) { p.take(s) << n; });
     jlpolymake.method("take",
                     [](pm::perl::BigObject& p, const std::string& s,
                        int64_t n) { p.take(s) << static_cast<pm::Int>(n); });

src/type_integer.cpp

@@ -82,6 +82,10 @@ void add_integer(jlcxx::Module& jlpolymake)
                 [](const pm::Integer& i) {
                     return show_small_object<pm::Integer>(i, false);
                 })
+        .method("take",
+                [](pm::perl::BigObject& p, const std::string& s, const pm::Integer& i) {
+                   p.take(s) << i;
+                })
         .method("isfinite", [](const pm::Integer& i) { return isfinite(i); })
         .method("Float64", [](const pm::Integer& a) { return double(a); })
         .method("-", [](const pm::Integer& a, const pm::Integer& b) { return a - b; })

src/type_quadraticextension.cpp

@@ -39,6 +39,10 @@ void add_quadraticextension(jlcxx::Module& jlpolymake)
             wrapped.method("show_small_obj", [](const WrappedT& S) {
                 return show_small_object<WrappedT>(S);
             });
+            wrapped.method("take",
+                [](pm::perl::BigObject& p, const std::string& s, const WrappedT& q) {
+                   p.take(s) << q;
+                });
         });
 
 }

src/type_rational.cpp

@@ -109,6 +109,10 @@ void add_rational(jlcxx::Module& jlpolymake)
                 [](const pm::Rational& r) {
                     return show_small_object<pm::Rational>(r, false);
                 })
+        .method("take",
+                [](pm::perl::BigObject& p, const std::string& s, const pm::Rational& r) {
+                   p.take(s) << r;
+                })
         .method("isfinite", [](const pm::Rational& r) { return isfinite(r); })
         .method("Float64", [](const pm::Rational& a) { return double(a); })
         .method("-", [](const pm::Rational& a, const pm::Rational& b) { return a - b; })

src/type_tropicalnumber.cpp

@@ -37,6 +37,8 @@ void add_tropicalnumber(jlcxx::Module& jlpolymake)
                     wrapped.method("show_small_obj", [](const tropType& S) {
                         return show_small_object<tropType>(S);
                     });
+                    wrapped.method("take", [](pm::perl::BigObject& p, const std::string& s,
+                            const tropType& v) { p.take(s) << v; });
             });
 }