File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -474,11 +474,10 @@ end
474474
475475# Fallback for extension objective types (e.g. SumGenerator as top-level objective)
476476function exafy_obj (o, bin, var_to_idx)
477- result = ExaModels. exafy_extension_obj_arg (o, var_to_idx)
478- if isnothing (result)
479- error (" Unsupported objective function type $(typeof (o)) " )
477+ if ! ExaModels. is_extension_type (typeof (o))
478+ throw (MOI. UnsupportedAttribute (MOI. ObjectiveFunction {typeof(o)} ()))
480479 end
481- e, p = result
480+ e, p = ExaModels . exafy_extension_obj_arg (o, var_to_idx)
482481 return update_bin! (bin, e, p)
483482end
484483
Original file line number Diff line number Diff line change @@ -25,11 +25,8 @@ include("TwoStageTest/TwoStageTest.jl")
2525include (" GetterSetterTest/GetterSetterTest.jl" )
2626include (" PrettyPrintTest.jl" )
2727# include("OptimalControlTest/OptimalControlTest.jl")
28- <<<<<< < HEAD
2928include (" OracleTest/OracleTest.jl" )
30- ====== =
3129include (" GenOptTest/GenOptTest.jl" )
32- >>>>>> > f1489f44 (Add extension to GenOpt)
3330
3431@testset verbose = true " ExaModels test" begin
3532 @info " Running Deprecated API Test"
@@ -65,9 +62,6 @@ include("GenOptTest/GenOptTest.jl")
6562 @info " Running Oracle Test"
6663 OracleTest. runtests ()
6764
68- @info " Running LinAlg Test"
69- LinAlgTest. runtests ()
70-
7165 @info " Running GenOpt Test"
7266 GenOptTest. runtests ()
7367end
You can’t perform that action at this time.
0 commit comments