Less restrictive algebraicsets

Author: blegat

src/algebraicset.jl

@@ -1,41 +1,28 @@
 export AlgebraicSet, BasicSemialgebraicSet, addequality!, addinequality!
 # Semialgebraic set described by polynomials with coefficients in T
-abstract AbstractSemialgebraicSet{T}
+abstract AbstractSemialgebraicSet
 
-addequality!{T}(S::AbstractSemialgebraicSet{T}, p) = addequality!(S, VecPolynomial{T}(p))
-addinequality!{T}(S::AbstractSemialgebraicSet{T}, p) = addinequality!(S, VecPolynomial{T}(p))
+abstract AbstractBasicSemialgebraicSet <: AbstractSemialgebraicSet
+abstract AbstractAlgebraicSet <: AbstractBasicSemialgebraicSet
 
-abstract AbstractBasicSemialgebraicSet{T} <: AbstractSemialgebraicSet{T}
-abstract AbstractAlgebraicSet{T} <: AbstractBasicSemialgebraicSet{T}
+addinequality!(S::AbstractAlgebraicSet, p) = throw(ArgumentError("Cannot add inequality to an algebraic set"))
 
-addinequality!{T}(S::AbstractAlgebraicSet{T}, p) = throw(ArgumentError("Cannot add inequality to an algebraic set"))
-
-type AlgebraicSet{T} <: AbstractAlgebraicSet{T}
-    p::Vector{VecPolynomial{T}}
-end
-function (::Type{AlgebraicSet{T}}){T}()
-    AlgebraicSet{T}(VecPolynomial{T}[])
+type AlgebraicSet <: AbstractAlgebraicSet
+    p::Vector
 end
-
-
-function Base.convert{T,U}(::Type{AlgebraicSet{T}}, V::AlgebraicSet{U})
-    AlgebraicSet{T}(Vector{VecPolynomial{T}}(V.p))
+function (::Type{AlgebraicSet})()
+    AlgebraicSet(Any[])
 end
 
-addequality!{T}(V::AlgebraicSet{T}, p::VecPolynomial{T}) = push!(V.p, p)
+addequality!(V::AlgebraicSet, p) = push!(V.p, p)
 
-type BasicSemialgebraicSet{T} <: AbstractBasicSemialgebraicSet{T}
-    V::AlgebraicSet{T}
-    p::Vector{VecPolynomial{T}}
+type BasicSemialgebraicSet <: AbstractBasicSemialgebraicSet
+    V::AlgebraicSet
+    p::Vector
 end
-function (::Type{BasicSemialgebraicSet{T}}){T}()
-    BasicSemialgebraicSet{T}(AlgebraicSet{T}(), VecPolynomial{T}[])
-end
-
-
-function Base.convert{T,U}(::Type{BasicSemialgebraicSet{T}}, S::BasicSemialgebraicSet{U})
-    BasicSemialgebraicSet{T}(convert(AlgebraicSet{T}, S.V), Vector{VecPolynomial{T}}(S.p))
+function (::Type{BasicSemialgebraicSet})()
+    BasicSemialgebraicSet(AlgebraicSet(), Any[])
 end
 
-addequality!{T}(S::BasicSemialgebraicSet{T}, p::VecPolynomial{T}) = addequality!(S.V, p)
-addinequality!{T}(S::BasicSemialgebraicSet{T}, p::VecPolynomial{T}) = push!(S.p, p)
+addequality!(S::BasicSemialgebraicSet, p) = addequality!(S.V, p)
+addinequality!(S::BasicSemialgebraicSet, p) = push!(S.p, p)

test/algebraicset.jl

@@ -1,17 +1,14 @@
 facts("Algebraic set") do
     @polyvar x y
-    V = AlgebraicSet{Int}()
+    V = AlgebraicSet()
     @fact_throws ArgumentError addinequality!(V, x*y)
-    S = BasicSemialgebraicSet{Int}()
+    S = BasicSemialgebraicSet()
     addequality!(S, x)
     addinequality!(S, x^2*y)
     addequality!(S, 2*x^2*y)
     @fact typeof(Int32(2)*x^2*y) --> Term{Int32}
     addequality!(S, Int32(2)*x^2*y)
     addinequality!(S, 1.0x^2*y)
     addequality!(S, (6//3)*x^2*y+y)
-    @fact_throws InexactError addinequality!(S, 1.5x^2*y)
-    S = BasicSemialgebraicSet{Float64}(S)
-    @fact typeof(S) --> BasicSemialgebraicSet{Float64}
     addinequality!(S, 1.5x+y)
 end