oscarnumber: add float conversion

.github/workflows/runtests.yml

@@ -31,16 +31,10 @@ jobs:
         os: ['ubuntu-latest']
         cxxwrap: [ '' ]
         include:
-          - cxxwrap: '0.13.4'
+          - cxxwrap: '0.14'
             os: ubuntu-latest
             julia-version: 1.9
-          - cxxwrap: '0.14.0'
-            os: ubuntu-latest
-            julia-version: 1.9
-          - cxxwrap: '0.13.4'
-            os: ubuntu-latest
-            julia-version: nightly
-          - cxxwrap: '0.14.0'
+          - cxxwrap: '0.14'
             os: ubuntu-latest
             julia-version: nightly
 

Project.toml

@@ -1,7 +1,7 @@
 name = "Polymake"
 uuid = "d720cf60-89b5-51f5-aff5-213f193123e7"
 repo = "https://github.com/oscar-system/Polymake.jl.git"
-version = "0.11.5"
+version = "0.11.6"
 
 [deps]
 BinaryWrappers = "f01c122e-0ea1-4f85-ad8f-907073ad7a9f"
@@ -24,7 +24,7 @@ polymake_oscarnumber_jll = "10f31823-b687-53e6-9f29-edb9d4da9f9f"
 
 [compat]
 BinaryWrappers = "~0.1.0"
-CxxWrap = "~0.10.1, ~0.11, ~0.12, ~0.13.1, ~0.14"
+CxxWrap = "~0.14"
 JSON = "^0.20, ^0.21"
 Mongoc = "~0.6.0, ~0.7.0, ~0.8.0, ~0.9.0"
 Ninja_jll = "^1.11.1"
@@ -35,4 +35,4 @@ julia = "^1.6"
 lib4ti2_jll = "^1.6.10"
 libpolymake_julia_jll = "~0.10.3"
 polymake_jll = "^400.900.0"
-polymake_oscarnumber_jll = "~0.2.5"
+polymake_oscarnumber_jll = "~0.2.7"

src/Polymake.jl

@@ -98,11 +98,7 @@ module LibPolymake
   using polymake_oscarnumber_jll
   import ..Polymake: libcxxwrap_build_version
 
-  if libcxxwrap_build_version() >= v"0.11.0"
-    @wrapmodule(() -> joinpath(libpolymake_julia), :define_module_polymake)
-  else
-    @wrapmodule(joinpath(libpolymake_julia), :define_module_polymake)
-  end
+  @wrapmodule(() -> joinpath(libpolymake_julia), :define_module_polymake)
 
   function __init__()
 
@@ -142,11 +138,7 @@ module LibOscarNumber
   import ..LibPolymake: show_small_obj
   import ..Polymake: libcxxwrap_build_version
 
-  if libcxxwrap_build_version() >= v"0.11.0"
-    @wrapmodule(() -> joinpath(libpolymake_oscarnumber), :define_module_polymake_oscarnumber)
-  else
-    @wrapmodule(joinpath(libpolymake_oscarnumber), :define_module_polymake_oscarnumber)
-  end
+  @wrapmodule(() -> joinpath(libpolymake_oscarnumber), :define_module_polymake_oscarnumber)
 
   function __init__()
 

src/oscarnumber.jl

@@ -63,8 +63,9 @@
     abs::Ptr{Cvoid}
     hash::Ptr{Cvoid}
     to_rational::Ptr{Cvoid}
+    to_float::Ptr{Cvoid}
 end
-oscar_number_dispatch_helper() = oscar_number_dispatch_helper(-1, repeat([C_NULL], 21)...)
+oscar_number_dispatch_helper() = oscar_number_dispatch_helper(-1, repeat([C_NULL], 22)...)
 
 const _on_gc_refs = IdDict()
 
@@ -135,6 +136,22 @@
       @cfunction(_on_sign_int, Clong, (Ref{ArgT},))
    end
 
+function _fieldelem_to_float(e::T) where T
+   if !hasmethod(Float64, Tuple{T})
+      error("OscarNumber: cannot coerce to Float64, please define 'Polymake._fieldelem_to_float(e::$T)::Float64'")
+   end
+   return Float64(e)
+end
+
+function _on_to_float(e::ArgT)::Float64 where ArgT
+   return _fieldelem_to_float(e)
+end
+
+@generated _on_gen_to_float(::Type{ArgT}) where ArgT =
+   quote
+      @cfunction(_on_to_float, Float64, (Ref{ArgT},))
+   end
+
 function _fieldelem_to_rational(e::T) where T
    if !hasmethod(Rational{BigInt}, Tuple{T})
       error("OscarNumber: cannot check is_rational, please define 'Polymake._fieldelem_to_rational(e::$T)::Rational{BigInt}'")
@@ -285,6 +302,7 @@
    dispatch.hash    = _on_gen_hash(t)
 
    dispatch.to_rational = _on_gen_to_rational(t)
+   dispatch.to_float = _on_gen_to_float(t)
 
    dispatch.cmp = _on_gen_cmp(t)
 
@@ -316,4 +334,3 @@
 (::Type{<:OscarNumber})(qe::QuadraticExtension) = OscarNumber(Rational(qe))
 OscarNumber(qe::QuadraticExtension) = OscarNumber(Rational(qe))
 
-Base.float(on::OscarNumber) = float(unwrap(on))

test/oscarnumber.jl

@@ -112,6 +112,12 @@
         if _with_oscar
             @test M * A2 == A2 * M == Polymake.OscarNumber(a1*a2 + 15 + 7*a2)
             @test Polymake.OscarNumber(5) // A2 == Polymake.OscarNumber(a2^2)
+            # avoid test error for older oscar versions
+            if length(methods(Polymake._fieldelem_to_float, (EmbeddedElem,), Oscar)) > 0
+               @test Polymake.common.convert_to{Float64}(A2) isa Float64
+               fa2 = Polymake.common.convert_to{Float64}(A2)
+               @test isapprox(fa2, 1.71; rtol=0.001)
+            end
         end
     end