Skip to content

Commit 83ffb33

Browse files
PasoStudio73PasoStudio73
committed
test working
1 parent bd889ac commit 83ffb33

File tree

13 files changed

+55
-104
lines changed

13 files changed

+55
-104
lines changed

‎Project.toml

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ name = "SoleModels"
22
uuid = "4249d9c7-3290-4ddd-961c-e1d3ec2467f8"
33
license = "MIT"
44
authors = ["Michele GHIOTTI", "Giovanni PAGLIARINI", "Edoardo PONSANESI", "Eduard I. STAN"]
5-
version = "0.10.0"
5+
version = "0.10.1"
66

77
[deps]
88
AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
@@ -30,41 +30,43 @@ XGBoostExt = "XGBoost"
3030
[compat]
3131
AbstractTrees = "0.4"
3232
CategoricalArrays = "0.10"
33-
DataFrames = "1"
34-
DecisionTree = "0.12"
3533
FillArrays = "1"
3634
FunctionWrappers = "1"
3735
IterTools = "1"
38-
Lazy = "0.15.1"
36+
Lazy = "0.15"
3937
PrettyTables = "2.2"
40-
Random = "1"
4138
Reexport = "1"
42-
SoleBase = "0.13.0"
43-
SoleData = "0.16.1"
44-
SoleLogics = "0.13.1"
39+
SoleBase = "0.13"
40+
SoleData = "0.16"
41+
SoleLogics = "0.13"
4542
StatsBase = "0.30 - 0.34"
4643
ThreadSafeDicts = "0.1"
47-
XGBoost = "2"
4844
julia = "1"
4945

5046
[extras]
51-
CategoricalArrays = "324d7699-5711-5eae-9e2f-1d82baa6b597"
5247
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
5348
DecisionTree = "7806a523-6efd-50cb-b5f6-3fa6f1930dbb"
54-
FunctionWrappers = "069b7b12-0de2-55c6-9aab-29f3d0a68a2e"
5549
InteractiveUtils = "b77e0a4c-d291-57a0-90e8-8db25a27a240"
5650
MLJ = "add582a8-e3ab-11e8-2d5e-e98b27df1bc7"
57-
MLJBase = "a7f614a8-145f-11e9-1d2a-a57a1082229d"
5851
MLJDecisionTreeInterface = "c6f25543-311c-4c74-83dc-3ea6d1015661"
5952
MLJModelInterface = "e80e1ace-859a-464e-9ed9-23947d8ae3ea"
6053
Markdown = "d6f4376e-aef5-505a-96c1-9c027394607a"
6154
MultiData = "8cc5100c-b3d1-4f82-90cb-0ea93d317aba"
6255
Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
63-
SoleData = "123f1ae1-6307-4526-ab5b-aab3a92a2b8c"
64-
SoleLogics = "b002da8f-3cb3-4d91-bbe3-2953433912b5"
65-
SoleModels = "4249d9c7-3290-4ddd-961c-e1d3ec2467f8"
6656
Test = "8dfed614-e22c-5e08-85e1-65c5234f0b40"
6757
XGBoost = "009559a3-9522-5dbb-924b-0b6ed2b22bb9"
6858

6959
[targets]
70-
test = ["Test", "CategoricalArrays", "DataFrames", "Random", "MLJ", "MultiData", "Markdown", "InteractiveUtils", "MLJBase", "XGBoost", "DecisionTree", "MLJModelInterface", "MLJDecisionTreeInterface", "SoleData", "SoleModels", "SoleLogics", "FunctionWrappers"]
60+
test = [
61+
"DataFrames",
62+
"DecisionTree",
63+
"InteractiveUtils",
64+
"MLJ",
65+
"MLJDecisionTreeInterface",
66+
"MLJModelInterface",
67+
"Markdown",
68+
"MultiData",
69+
"Random",
70+
"Test",
71+
"XGBoost"
72+
]

‎pluto-demo.jl

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
11
### A Pluto.jl notebook ###
22
# v0.19.38
33

4-
using Markdown
5-
using InteractiveUtils
4+
# using Markdown
5+
# using InteractiveUtils
66

77
# ╔═╡ 7685d19e-cc98-4031-a6f9-29ecccc9f417
88
begin
9-
using SoleModels
10-
using DataFrames
9+
# using SoleModels
10+
# using DataFrames
1111

1212
# Load an example time-series classification dataset as a tuple (DataFrame, Vector{String})
1313
X_df, y = SoleModels.load_arff_dataset("NATOPS")
@@ -32,7 +32,7 @@ end
3232

3333
# ╔═╡ 1ccda54b-1b70-4353-ace6-fe277e5bf67f
3434
begin
35-
using MultiData
35+
# using MultiData
3636

3737
# Construct a logiset from a DataFrame
3838
logiset = scalarlogiset(X_df, features)

‎test/DecisionTreeExt/adaboost.jl

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
using Test
2-
3-
using MLJ
4-
using MLJBase
5-
using DataFrames
6-
using CategoricalArrays
7-
8-
using MLJDecisionTreeInterface
9-
using SoleModels
10-
using Random
11-
12-
import DecisionTree as DT
13-
141
X, y = @load_iris
152
X = DataFrame(X)
163

‎test/DecisionTreeExt/forest.jl

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,3 @@
1-
using Test
2-
3-
using MLJ
4-
using MLJBase
5-
using DataFrames
6-
7-
using MLJDecisionTreeInterface
8-
using SoleModels
9-
using Random
10-
11-
import DecisionTree as DT
12-
131
X, y = @load_iris
142
X = DataFrame(X)
153

‎test/DecisionTreeExt/tree.jl

Lines changed: 0 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,3 @@
1-
using Test
2-
3-
using MLJ
4-
using MLJBase
5-
using DataFrames
6-
7-
using MLJDecisionTreeInterface
8-
using SoleModels
9-
using Random
10-
using CategoricalArrays
11-
12-
import DecisionTree as DT
13-
141
X, y = @load_iris
152
X = DataFrame(X)
163

‎test/XGBoostExt/xgboost_classifier.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
using Test
22

33
using MLJ
4-
using MLJBase
4+
# using MLJBase
55
using DataFrames
66

77
using SoleModels

‎test/base.jl

Lines changed: 0 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,3 @@
1-
using SoleModels
2-
using SoleLogics
3-
using FunctionWrappers: FunctionWrapper
4-
using SoleModels: AbstractModel
5-
using SoleModels: ConstantModel, LeafModel
6-
using Test
7-
81
# base.jl
92

103
io = IOBuffer()

‎test/juliacon2024.jl

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
11
# JuliaCon2024 demo
22

33
# Load packages
4-
begin
5-
using MLJ
6-
using MLJDecisionTreeInterface
7-
using DataFrames
8-
using Random
9-
end
4+
# begin
5+
# using MLJ
6+
# using MLJDecisionTreeInterface
7+
# using DataFrames
8+
# using Random
9+
# end
1010

1111
# Load dataset
1212
X, y = begin

‎test/linear-form-utilities.jl

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,3 @@
1-
using Test
2-
using SoleLogics
3-
using SoleModels
4-
5-
61
b = Branch(LeftmostConjunctiveForm((@atoms p q r s)), "YES", "NO")
72

83
@test_nowarn b[1:3]

‎test/misc.jl

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,3 @@
1-
# using Revise
2-
3-
# using Reexport
4-
using FunctionWrappers: FunctionWrapper
5-
using Test
6-
using SoleLogics
7-
using SoleModels
8-
using SoleModels: AbstractModel
9-
using SoleModels: ConstantModel, LeafModel
10-
using SoleModels: listrules, displaymodel, submodels
11-
121
io = IOBuffer()
132

143
parse_other_kind_of_formula = SoleLogics.parseformula

0 commit comments

Comments
 (0)