Fix in LNS/GVNS: Termination condition has not been considered after …

…initial construction
ac-tuwien · Dec 8, 2023 · c2f5a37 · c2f5a37 · graidl · Dec 8, 2023
1 parent 283cfc6
commit c2f5a37
Show file tree

Hide file tree

Showing 14 changed files with 35 additions and 28 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -5,8 +5,12 @@ Major changes in releases:
 
 ## Upcoming
 
+## Version 0.1.12
+- Fix in `GVNS` and `LNS`: The termination condition has not been considered directly after
+    performing the initial construction method(s).
+
 ## Version 0.1.11
-- Fix in ``GVNS`: Empty local search method list led to an infinite loop 
+- Fix in `GVNS`: Empty local search method list led to an infinite loop 
     [issue #5](/../../issues/5)
 
 ## Version 0.1.10

diff --git a/MHLibDemos/Manifest.toml b/MHLibDemos/Manifest.toml
@@ -34,9 +34,9 @@ version = "1.3.5"
 
 [[deps.Compat]]
 deps = ["UUIDs"]
-git-tree-sha1 = "8a62af3e248a8c4bad6b32cbbe663ae02275e32c"
+git-tree-sha1 = "886826d76ea9e72b35fcd000e535588f7b60f21d"
 uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
-version = "4.10.0"
+version = "4.10.1"
 weakdeps = ["Dates", "LinearAlgebra"]
 
     [deps.Compat.extensions]
@@ -153,15 +153,15 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
 
 [[deps.LoweredCodeUtils]]
 deps = ["JuliaInterpreter"]
-git-tree-sha1 = "c165f205e030208760ebd75b5e1f7706761d9218"
+git-tree-sha1 = "0b8cf121228f7dae022700c1c11ac1f04122f384"
 uuid = "6f1432cf-f94c-5a45-995e-cdbf5db27b0b"
-version = "2.3.1"
+version = "2.3.2"
 
 [[deps.MHLib]]
 deps = ["ArgParse", "DataStructures", "Logging", "Printf", "Random", "Reexport", "StatsBase"]
 path = ".."
 uuid = "0f3a0e6e-e0e7-4894-bd64-856f0ae3b635"
-version = "0.1.10"
+version = "0.1.12"
 
 [[deps.MacroTools]]
 deps = ["Markdown", "Random"]

diff --git a/MHLibDemos/bin/demo_graph_coloring.jl b/MHLibDemos/bin/demo_graph_coloring.jl
@@ -13,5 +13,5 @@ using MHLibDemos
 
 # Command line arguments are parsed and used to set global parameters
 # use `@<filename>` to read parameters from configuration file `<filename>`
-# alternatively, they may also be provided here to the call as vector of strings
-solve_graph_coloring()
+# alternatively, they may also be provided here in a string
+solve_graph_coloring("--gcp_colors=3")
diff --git a/MHLibDemos/bin/demo_maxsat.jl b/MHLibDemos/bin/demo_maxsat.jl
@@ -13,5 +13,5 @@ using MHLibDemos
 
 # Command line arguments are parsed and used to set global parameters
 # use `@<filename>` to read parameters from configuration file `<filename>`
-# alternatively, they may also be provided here to the call as vector of strings
-solve_maxsat()
+# alternatively, they may also be provided here as a string
+solve_maxsat("--seed=8 --mh_ttime=3")
diff --git a/MHLibDemos/bin/demo_misp.jl b/MHLibDemos/bin/demo_misp.jl
@@ -17,4 +17,4 @@ using MHLibDemos
 # solve_misp()
 
 # for testing on a small random graph
-solve_misp(["--seed", "3", "--ifile", "gnm-10-13"])
+solve_misp("--seed=3 --ifile=gnm-10-13")
diff --git a/MHLibDemos/bin/demo_mkp.jl b/MHLibDemos/bin/demo_mkp.jl
@@ -13,5 +13,5 @@ using MHLibDemos
 
 # Command line arguments are parsed and used to set global parameters
 # use `@<filename>` to read parameters from configuration file `<filename>`
-# alternatively, they may also be provided here to the call as vector of strings
+# alternatively, they may also be provided here in a string
 solve_mkp()
diff --git a/MHLibDemos/bin/demo_onemax.jl b/MHLibDemos/bin/demo_onemax.jl
@@ -13,5 +13,5 @@ using MHLibDemos
 
 # Command line arguments are parsed and used to set global parameters
 # use `@<filename>` to read parameters from configuration file `<filename>`
-# alternatively, they may also be provided here to the call as vector of strings
-solve_onemax()
+# alternatively, they may also be provided here in a string
+solve_onemax("--onemax_n=90")
diff --git a/MHLibDemos/bin/demo_tsp.jl b/MHLibDemos/bin/demo_tsp.jl
@@ -15,4 +15,4 @@ using MHLibDemos
 # Command line arguments are parsed and used to set global parameters
 # use `@<filename>` to read parameters from configuration file `<filename>`
 # alternatively, they may also be provided here to the call as vector of strings
-solve_tsp()
+solve_tsp("--mh_titer=1000")
diff --git a/Manifest.toml b/Manifest.toml
@@ -2,7 +2,7 @@
 
 julia_version = "1.9.4"
 manifest_format = "2.0"
-project_hash = "120b5576b04f4d26ef6670cecf1c2071e4f8ef62"
+project_hash = "173a5d24d7b4bfc564ba26748cb660b12b7a8032"
 
 [[deps.ArgParse]]
 deps = ["Logging", "TextWrap"]
@@ -22,9 +22,9 @@ uuid = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"
 
 [[deps.Compat]]
 deps = ["UUIDs"]
-git-tree-sha1 = "8a62af3e248a8c4bad6b32cbbe663ae02275e32c"
+git-tree-sha1 = "886826d76ea9e72b35fcd000e535588f7b60f21d"
 uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
-version = "4.10.0"
+version = "4.10.1"
 weakdeps = ["Dates", "LinearAlgebra"]
 
     [deps.Compat.extensions]

diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "MHLib"
 uuid = "0f3a0e6e-e0e7-4894-bd64-856f0ae3b635"
 authors = ["Guenther Raidl <[email protected]> and others"]
-version = "0.1.11"
+version = "0.1.12"
 
 [deps]
 ArgParse = "c7e460c6-2fb9-53a9-8c5b-16f535851c63"

diff --git a/src/GVNSs.jl b/src/GVNSs.jl
@@ -129,7 +129,8 @@ Actually performs the construction heuristics followed by the GVNS.
 function MHLib.run!(gvns::GVNS)
     sol = copy(gvns.scheduler.incumbent)
     @assert gvns.scheduler.incumbent_valid || !isempty(gvns.meths_ch)
-    perform_sequentially!(gvns.scheduler, sol, gvns.meths_ch)
+    terminate = perform_sequentially!(gvns.scheduler, sol, gvns.meths_ch)
+    terminate && return
     gvns!(gvns, sol)
 end
 

diff --git a/src/LNSs.jl b/src/LNSs.jl
@@ -270,7 +270,8 @@ Perform the construction heuristics followed by a LNS.
 function MHLib.run!(lns::LNS)
     sol = copy(lns.scheduler.incumbent)
     @assert lns.scheduler.incumbent_valid || !isempty(lns.meths_ch)
-    perform_sequentially!(lns.scheduler, sol, lns.meths_ch)
+    terminate = perform_sequentially!(lns.scheduler, sol, lns.meths_ch)
+    terminate && return
     lns!(lns, sol)
 end
 

diff --git a/src/Schedulers.jl b/src/Schedulers.jl
@@ -325,15 +325,16 @@ end
     perform_sequentially!(scheduler, solution, methods)
 
 Applies the given methods sequentially, finally keeping the best solution as incumbent.
+
+Returns true if the termination condition has been fulfilled, else false.
 """
 function perform_sequentially!(s::Scheduler, sol::Solution, meths::Vector{MHMethod})
     for m in next_method(meths)
         res = perform_method!(s, m, sol)
-        if res.terminate
-            break
-        end
         update_incumbent!(s, sol, time() - s.time_start)
+        res.terminate && return true
     end
+    return false
 end
 
 

diff --git a/test/Manifest.toml b/test/Manifest.toml
@@ -34,9 +34,9 @@ version = "1.3.5"
 
 [[deps.Compat]]
 deps = ["UUIDs"]
-git-tree-sha1 = "8a62af3e248a8c4bad6b32cbbe663ae02275e32c"
+git-tree-sha1 = "886826d76ea9e72b35fcd000e535588f7b60f21d"
 uuid = "34da2185-b29b-5c13-b0c7-acf172513d20"
-version = "4.10.0"
+version = "4.10.1"
 weakdeps = ["Dates", "LinearAlgebra"]
 
     [deps.Compat.extensions]
@@ -153,9 +153,9 @@ uuid = "56ddb016-857b-54e1-b83d-db4d58db5568"
 
 [[deps.LoweredCodeUtils]]
 deps = ["JuliaInterpreter"]
-git-tree-sha1 = "c165f205e030208760ebd75b5e1f7706761d9218"
+git-tree-sha1 = "0b8cf121228f7dae022700c1c11ac1f04122f384"
 uuid = "6f1432cf-f94c-5a45-995e-cdbf5db27b0b"
-version = "2.3.1"
+version = "2.3.2"
 
 [[deps.MacroTools]]
 deps = ["Markdown", "Random"]