Merge pull request #25 from davide-f/update-version

Update version
oxinabox · May 13, 2022 · f4ac3be · f4ac3be · oxinabox · May 13, 2022
2 parents 6580041 + 9a7b77e
commit f4ac3be
Show file tree

Hide file tree

Showing 20 changed files with 3 additions and 14 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "LayeredLayouts"
 uuid = "f4a74d36-062a-4d48-97cd-1356bad1de4e"
 authors = ["Lyndon White <lyndon.white@invenialabs.co.uk> and contributors"]
-version = "0.2.2"
+version = "0.2.3"
 
 [deps]
 Cbc = "9961bab8-2fa3-5c5a-9d89-47fab24efd76"
@@ -17,7 +17,7 @@ Cbc = "0.7,0.8,0.9,1"
 ECOS = "0.12.1,0.13,0.14,1"
 Graphs = "1.4"
 IterTools = "1.3"
-JuMP = "0.21.3, 0.22, 0.23"
+JuMP = "0.21.3, 0.22, 0.23, 1"
 julia = "1"
 
 [extras]

diff --git a/src/zarate.jl b/src/zarate.jl
@@ -21,21 +21,10 @@ In 2018 IEEE Pacific Visualization Symposium (PacificVis) (pp. 135-139). IEEE.
 """
 Base.@kwdef struct Zarate <: AbstractLayout
     time_limit::Dates.Period = Dates.Second(0)
-    ordering_solver::Any = ()->_default_ordering_solver()
+    ordering_solver::Any = optimizer_with_attributes(Cbc.Optimizer, "randomSeed"=>1, "randomCbcSeed"=>1)
     arranging_solver::Any = ECOS.Optimizer
 end
 
-"""
-	_default_ordering_solver()
-
-Default optimizer for ordering - `Cbc` with the random number seed `randomCbcSeed` set to `1`
-"""
-function _default_ordering_solver()
-    optimizer = Cbc.Optimizer()
-    MOI.set(optimizer, MOI.RawOptimizerAttribute("randomCbcSeed"), 1)
-    return optimizer
- end
-
 """
     solve_positions(::Zarate, graph; force_layer, force_order)
 

diff --git a/test/references/.DS_Store b/test/references/.DS_Store
diff --git a/test/references/Zarate/direct/cross.png b/test/references/Zarate/direct/cross.png
diff --git a/test/references/Zarate/direct/loop.png b/test/references/Zarate/direct/loop.png
diff --git a/test/references/Zarate/direct/medium_pert.png b/test/references/Zarate/direct/medium_pert.png
diff --git a/test/references/Zarate/direct/tiny_depgraph.png b/test/references/Zarate/direct/tiny_depgraph.png
diff --git a/test/references/Zarate/direct/tree.png b/test/references/Zarate/direct/tree.png
diff --git a/test/references/Zarate/direct/two_lines.png b/test/references/Zarate/direct/two_lines.png
diff --git a/test/references/Zarate/direct/two_lines_force_order.png b/test/references/Zarate/direct/two_lines_force_order.png
diff --git a/test/references/Zarate/direct/xcross.png b/test/references/Zarate/direct/xcross.png
diff --git a/test/references/Zarate/paths/cross.png b/test/references/Zarate/paths/cross.png
diff --git a/test/references/Zarate/paths/loop.png b/test/references/Zarate/paths/loop.png
diff --git a/test/references/Zarate/paths/medium_pert.png b/test/references/Zarate/paths/medium_pert.png
diff --git a/test/references/Zarate/paths/tiny_depgraph.png b/test/references/Zarate/paths/tiny_depgraph.png
diff --git a/test/references/Zarate/paths/tree.png b/test/references/Zarate/paths/tree.png
diff --git a/test/references/Zarate/paths/two_lines.png b/test/references/Zarate/paths/two_lines.png
diff --git a/test/references/Zarate/paths/two_lines_force_order.png b/test/references/Zarate/paths/two_lines_force_order.png
diff --git a/test/references/Zarate/paths/xcross.png b/test/references/Zarate/paths/xcross.png
diff --git a/test/references/test_utils/quick_plot.png b/test/references/test_utils/quick_plot.png