Merge branch 'master' into update_tuto_custom_data

atoptima · Jul 4, 2023 · b1b8a8b · b1b8a8b
2 parents 39d85a5 + dea2220
commit b1b8a8b
Show file tree

Hide file tree

Showing 28 changed files with 1,315 additions and 496 deletions.
diff --git a/NEWS.md b/NEWS.md
@@ -1,3 +1,7 @@
+# Coluna 0.6.4
+
+This is a minor update that provides documentation and a bug fix in the integration of the column generation algorithm with the branch-and-bound.
+
 # Coluna 0.6.3
 
 This is a minor update that provides:

diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "Coluna"
 uuid = "88b4ec78-b192-11e8-04aa-4d367dd96a64"
 authors = ["François Vanderbeck", "Guillaume Marques", "Vitor Nesello", "Ruslan Sadykov"]
-version = "0.6.3"
+version = "0.6.4"
 
 [deps]
 BlockDecomposition = "6cde8614-403a-11e9-12f1-c10d0f0caca0"

diff --git a/docs/make.jl b/docs/make.jl
@@ -33,11 +33,11 @@ Literate.markdown(TUTORIAL_STORAGE_API, OUTPUT_STORAGE_API, documenter=true)
 makedocs(
     modules = [Coluna, BlockDecomposition],
     checkdocs = :exports,
-    sitename = "Coluna User Guide",
+    sitename = "Coluna.jl",
     authors = "Atoptima & contributors",
     format = Documenter.HTML(
         prettyurls = get(ENV, "CI", nothing) == "true",
-        collapselevel = 1,
+        collapselevel = 2,
         assets = ["assets/js/init.js"]
     ),
     strict = false,
@@ -67,6 +67,7 @@ makedocs(
             "User-defined Callbacks"   => joinpath("man", "callbacks.md"),
         ],
         "API" => Any[
+            "Verification of algorithms parameters and consistency" => joinpath("api", "check_algos.md"),
             "Benders" => joinpath("api", "benders.md"),
             "Branching" => joinpath("api", "branching.md"),
             "ColGen" => joinpath("api", "colgen.md"),