Skip to content
This repository was archived by the owner on Jun 14, 2020. It is now read-only.

Commit d6957f3

Browse files
authored
Merge pull request #39 from rdeits/rd/inner-type
make it possible to set the type of the inner model
2 parents d448b17 + 95d1794 commit d6957f3

File tree

1 file changed

+5
-10
lines changed

1 file changed

+5
-10
lines changed

src/LinQuadOptInterface.jl

Lines changed: 5 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -199,24 +199,17 @@ function Base.isempty(map::ConstraintMapping)
199199
return ret
200200
end
201201

202-
macro def(name, definition)
203-
return quote
204-
macro $(esc(name))()
205-
esc($(Expr(:quote, definition)))
206-
end
207-
end
208-
end
209-
210202
@enum(ObjectiveType,
211203
SingleVariableObjective,
212204
AffineObjective,
213205
QuadraticObjective)
214206

215207
# Abstract + macro
216208
abstract type LinQuadOptimizer <: MOI.AbstractOptimizer end
217-
@def LinQuadOptimizerBase begin
218209

219-
inner#::LinQuadOptInterface.LinQuadOptimizer
210+
macro LinQuadOptimizerBase(inner_model_type=Any)
211+
esc(quote
212+
inner::$inner_model_type
220213

221214
name::String
222215

@@ -256,8 +249,10 @@ abstract type LinQuadOptimizer <: MOI.AbstractOptimizer end
256249
dual_result_count::Int
257250

258251
solvetime::Float64
252+
end)
259253
end
260254

255+
261256
function MOI.isempty(m::LinQuadOptimizer)
262257

263258
ret = true

0 commit comments

Comments
 (0)