From 82341d6692787b6c18d868816bed55f0f2bb9c51 Mon Sep 17 00:00:00 2001 From: giopaglia <24519853+giopaglia@users.noreply.github.com> Date: Mon, 13 Nov 2023 15:20:51 +1100 Subject: [PATCH] Fixes and bump version --- Project.toml | 4 ++-- docs/make.jl | 3 ++- docs/src/index.md | 2 +- pluto-demo.jl | 6 +++--- test/runtests.jl | 2 +- 5 files changed, 9 insertions(+), 8 deletions(-) diff --git a/Project.toml b/Project.toml index 234896c..dec3983 100644 --- a/Project.toml +++ b/Project.toml @@ -1,7 +1,7 @@ name = "Sole" uuid = "7b3b3b3f-8b15-4a80-a798-b383498bc2cf" authors = ["Federico Manzella", "Giovanni Pagliarini", "Eduard I. Stan", "Guido Sciavicco"] -version = "0.1.0" +version = "0.2.0" [deps] Reexport = "189a3867-3050-52da-a836-e630ba90ab69" @@ -15,7 +15,7 @@ julia = "1" SoleBase = "0.11" SoleData = "0.11" SoleLogics = "0.6" -SoleModels = "0.3" +SoleModels = "0.4" Reexport = "1.2" [extras] diff --git a/docs/make.jl b/docs/make.jl index 1df4721..a5661b3 100644 --- a/docs/make.jl +++ b/docs/make.jl @@ -6,9 +6,10 @@ DocMeta.setdocmeta!(Sole, :DocTestSetup, :(using Sole); recursive=true) makedocs(; modules=[Sole], authors="Federico Manzella, Giovanni Pagliarini, Eduard I. Stan, Guido Sciavicco", - repo="https://github.com/aclai-lab/Sole.jl/blob/{commit}{path}#{line}", + repo=Documenter.Remotes.GitHub("aclai-lab", "Sole.jl"), sitename="Sole.jl", format=Documenter.HTML(; + size_threshold = 4000000, prettyurls=get(ENV, "CI", "false") == "true", canonical="https://aclai-lab.github.io/Sole.jl", assets=String[], diff --git a/docs/src/index.md b/docs/src/index.md index c7c42a1..d0dc43d 100644 --- a/docs/src/index.md +++ b/docs/src/index.md @@ -4,7 +4,7 @@ CurrentModule = Sole # Sole -Documentation for [Sole](https://github.com/aclai-lab/Sole.jl). +Welcome to the documentation for [Sole](https://github.com/aclai-lab/Sole.jl). ```@index ``` diff --git a/pluto-demo.jl b/pluto-demo.jl index 71c00ec..029de33 100644 --- a/pluto-demo.jl +++ b/pluto-demo.jl @@ -67,7 +67,7 @@ begin using Random # Create a random formula - φ4 = randformula(Random.MersenneTwister(107), 3, [p,q], SoleLogics.BASE_PROPOSITIONAL_OPERATORS) + φ4 = randformula(Random.MersenneTwister(107), 3, [p,q], SoleLogics.BASE_PROPOSITIONAL_CONNECTIVES) φ4 |> syntaxstring |> println @@ -136,7 +136,7 @@ md""" # ╔═╡ a01c8457-42e6-47ed-bfca-bd8c278d9574 # Generate a random MODAL formula -φ10 = randformula(Random.MersenneTwister(14), 3, [p,q], SoleLogics.BASE_MODAL_OPERATORS) +φ10 = randformula(Random.MersenneTwister(14), 3, [p,q], SoleLogics.BASE_MODAL_CONNECTIVES) # ╔═╡ 7c533604-a185-4b52-837c-420f2078840f # Pick the first world @@ -260,7 +260,7 @@ end # ╔═╡ 00310a1c-c4f4-43bc-a60c-a6113434f242 begin # Sprinkle the model with the test instances! - predictions, tree_test = report(mach).sprinkle(X_df[test_idxs,:], y2[test_idxs]); + predictions, tree_test = report(mach).sprinkle(X_df2[test_idxs,:], y2[test_idxs]); # Extract ruleset and print its metrics ruleset_test = listrules(tree_test) diff --git a/test/runtests.jl b/test/runtests.jl index 9ef5e4a..ee9c676 100644 --- a/test/runtests.jl +++ b/test/runtests.jl @@ -14,7 +14,7 @@ end println("Julia version: ", VERSION) test_suites = [ - # ("Pluto Demo", ["$(dirname(dirname(pathof(Sole))))/pluto-demo.jl", ]), + ("Pluto Demo", ["$(dirname(dirname(pathof(Sole))))/pluto-demo.jl", ]), ] @testset "Sole.jl" begin