Merge branch 'dev' into gio/refractoring

Author: giopaglia

Project.toml

@@ -2,7 +2,7 @@ name = "SoleModels"
 uuid = "4249d9c7-3290-4ddd-961c-e1d3ec2467f8"
 license = "MIT"
 authors = ["Michele GHIOTTI", "Giovanni PAGLIARINI", "Edoardo PONSANESI", "Eduard I. STAN"]
-version = "0.8.3"
+version = "0.9.0"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
@@ -52,7 +52,7 @@ Random = "1"
 Reexport = "1"
 Revise = "3"
 SoleBase = "0.12"
-SoleData = "0.15"
+SoleData = "0.15, 0.16"
 SoleLogics = "0.9, 0.10"
 StatsBase = "0.30 - 0.34"
 Suppressor = "0.2"

src/SoleModels.jl

@@ -31,6 +31,7 @@ using SoleData.DimensionalDatasets: globalrel
 export AbstractModel
 export iscomplete
 export outcometype, outputtype
+export immediatesubmodels, nimmediatesubmodels, listimmediaterules
 export apply, apply!
 export info, info!, hasinfo
 export wrap
@@ -60,7 +61,10 @@ export trees
 
 export MixedModel
 
+export solemodel
+
 include("types/model.jl")
+include("types/AbstractTrees.jl")
 include("types/api.jl")
 
 include("utils/models/leaf.jl")
@@ -70,13 +74,14 @@ include("utils/models/linear-forms-utilities.jl")
 include("utils/models/wrap.jl")
 include("utils/models/syntax-utilities.jl")
 
-include("apply!.jl")
 
 export printmodel, displaymodel
 
 include("print.jl")
 
-export immediatesubmodels, listimmediaterules
+export submodels, nsubmodels
+export leafmodels, nleafmodels
+export subtreeheight
 export listrules, joinrules
 
 include("symbolic-utils.jl")

src/apply!.jl

@@ -3,3 +3,16 @@ const MixedSymbolicModel = MixedModel
 const List = DecisionList
 const Tree = DecisionTree
 const Forest = DecisionForest
+
+
+
+@inline function apply(
+    m::AbstractModel,
+    d::AbstractInterpretationSet,
+    i_instance::Integer;
+    kwargs...
+)::outputtype(m)
+    @warn "apply(model, dataset, i_instance) is deprecating... Please use apply(model, get_instance(dataset, i_instance)) instead."
+    interpretation = get_instance(d, i_instance)
+    apply(m, interpretation; kwargs...)
+end

src/deprecate.jl

@@ -215,7 +215,7 @@ function evaluaterule(
 )
     #println("Evaluation rule in time...")
     ys = apply(rule,X)
-    #if X isa SupportedLogiset
+    #if SoleData.hassupports(X)
     #    println("# Memoized Values: $(nmemoizedvalues(X))")
     #end