Julia 0.5 changes

JuliaSmoothOptimizers · Oct 3, 2016 · 423bc2d · 423bc2d
1 parent dc1d1c9
commit 423bc2d
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/src/classification.jl b/src/classification.jl
@@ -2,13 +2,13 @@ import JSON
 
 # Some enumerations and correspondance dicts
 const objtypes = ["none", "constant", "linear", "quadratic", "sum_of_squares", "other"]
-const classdb_objtype = [x=>objtypes[i] for (i,x) in enumerate("NCLQSO")]
+const classdb_objtype = Dict(x=>objtypes[i] for (i,x) in enumerate("NCLQSO"))
 
 const contypes = ["unc", "fixed_vars", "bounds", "network", "linear", "quadratic", "general"]
-const classdb_contype = [x=>contypes[i] for (i,x) in enumerate("UXBNLQO")]
+const classdb_contype = Dict(x=>contypes[i] for (i,x) in enumerate("UXBNLQO"))
 
 const origins = ["academic", "modelling", "real"]
-const classdb_origin = [x=>origins[i] for (i,x) in enumerate("AMR")]
+const classdb_origin = Dict(x=>origins[i] for (i,x) in enumerate("AMR"))
 
 """`create_class()`
 

diff --git a/test/REQUIRE b/test/REQUIRE
@@ -1,3 +1,4 @@
+Combinatorics
 FactCheck
 MathProgBase
 Ipopt

diff --git a/test/test_select.jl b/test/test_select.jl
@@ -1,3 +1,5 @@
+using Combinatorics
+
 small_problem = "HS4"
 large_problem = "AUG3D"
 unc_problem = "BARD"