From 445689400f17d986d8f82365f3e23caa944ea769 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Beno=C3=AEt=20Legat?= Date: Tue, 22 Aug 2017 12:55:27 +0200 Subject: [PATCH] Fix travis --- .travis.yml | 2 ++ src/macros.jl | 6 +++--- test/REQUIRE | 1 + 3 files changed, 6 insertions(+), 3 deletions(-) create mode 100644 test/REQUIRE diff --git a/.travis.yml b/.travis.yml index 90dfb0e..15e9793 100644 --- a/.travis.yml +++ b/.travis.yml @@ -13,6 +13,8 @@ notifications: # - julia -e 'Pkg.clone(pwd()); Pkg.build("PolyJuMP"); Pkg.test("PolyJuMP"; coverage=true)' before_script: - julia -e 'Pkg.clone("git://github.com/blegat/MultivariatePolynomials.jl.git")' + - julia -e 'Pkg.clone("git://github.com/blegat/SemialgebraicSets.jl.git")' + - julia -e 'Pkg.clone("git://github.com/blegat/DynamicPolynomials.jl.git")' after_success: # push coverage results to Coveralls - julia -e 'cd(Pkg.dir("PolyJuMP")); Pkg.add("Coverage"); using Coverage; Coveralls.submit(Coveralls.process_folder())' diff --git a/src/macros.jl b/src/macros.jl index 47415b7..a1a08e8 100644 --- a/src/macros.jl +++ b/src/macros.jl @@ -1,13 +1,13 @@ using JuMP -import JuMP: getvalue, validmodel, addtoexpr_reorder +import JuMP: validmodel, addtoexpr_reorder using Base.Meta export Poly, @set -function getvalue(t::AbstractTerm{JuMP.Variable}) +function JuMP.getvalue(t::AbstractTerm{<:JuMP.AbstractJuMPScalar}) getvalue(coefficient(t)) * monomial(t) end -function getvalue(p::AbstractPolynomialLike{JuMP.Variable}) +function JuMP.getvalue(p::AbstractPolynomialLike{<:JuMP.AbstractJuMPScalar}) polynomial(getvalue.(terms(p)), MultivariatePolynomials.SortedUniqState()) end diff --git a/test/REQUIRE b/test/REQUIRE new file mode 100644 index 0000000..d720c3f --- /dev/null +++ b/test/REQUIRE @@ -0,0 +1 @@ +DynamicPolynomials