Merge pull request #120 from IBM/remove-reexport

Refactor exported variables
IBM · Jan 6, 2020 · f03c92e · f03c92e
2 parents 9cdbcc3 + 49002b4
commit f03c92e
Show file tree

Hide file tree

Showing 34 changed files with 141 additions and 416 deletions.
diff --git a/Project.toml b/Project.toml
@@ -1,7 +1,7 @@
 name = "TSML"
 uuid = "198dc43e-9e51-5cd7-9d40-d9794d335912"
 authors = ["Paulito Palmes <ppalmes@gmail.com>"]
-version = "2.4.3"
+version = "2.4.4"
 
 [deps]
 AbstractTrees = "1520ce14-60c1-5f80-bbc7-55ef81b5835c"
@@ -23,7 +23,6 @@ MLDataUtils = "cc2ba9b6-d476-5e6d-8eaf-a92d5412d41d"
 MultivariateStats = "6f286f6a-111f-5878-ab1e-185364afe411"
 Plots = "91a5bcdd-55d7-5caf-9e0b-520d859cae80"
 Random = "9a3f8284-a2c9-5f02-9a11-845980a1fd5c"
-Reexport = "189a3867-3050-52da-a836-e630ba90ab69"
 Serialization = "9e88b42a-f829-5b0c-bbe9-9e923198166b"
 Statistics = "10745b16-79ce-11e8-11f9-7d13ad32a3b2"
 StatsBase = "2913bbd2-ae8a-5f71-8c99-4fb6c76f3a91"
@@ -46,7 +45,6 @@ MLBase = "0.6, 0.7, 0.8, 0.9, 1.0"
 MLDataUtils = "0.2, 0.3, 0.4, 0.5, 1.0"
 MultivariateStats = "0.5, 0.6, 0.7, 0.8, 0.9, 1.0"
 Plots = "0.25, 0.26, 0.27, 0.28, 1.0"
-Reexport = "0.1, 0.2, 0.3"
 StatsBase = "0.25, 0.26, 0.27, 0.28, 0.29, 0.30, 0.31, 0.32, 1.0"
 Tables = "0.2"
 julia = "1"

diff --git a/src/TSML.jl b/src/TSML.jl
@@ -1,5 +1,6 @@
 module TSML
-using Reexport
+
+export fit!, transform!
 
 # reexport common functions to Main
 include("pkgdeps.jl")
@@ -10,63 +11,90 @@ using .Imputers
 
 include("types.jl")
 using .TSMLTypes
+export  Transformer,TSLearner
 
 include("utils.jl")
 using .Utils
+export holdout, kfold, score, infer_eltype, nested_dict_to_tuples, 
+       nested_dict_set!, nested_dict_merge, create_transformer,
+       mergedict, getiris,
+       skipmean,skipmedian,skipstd,
+       aggregatorclskipmissing
 
 include("baseline.jl")
 using .BaselineAlgos
+export Baseline,Identity
 
 include("basefilters.jl")
 using .BaseFilters
+export Imputer,Pipeline,OneHotEncoder,Wrapper
 
 include("valdatefilters.jl")
 using .ValDateFilters
+export Matrifier,Dateifier,
+       DateValizer,DateValgator,DateValNNer,DateValMultiNNer,
+       CSVDateValReader, CSVDateValWriter, DateValLinearImputer,
+       BzCSVDateValReader
 
 include("statifier.jl")
 using .Statifiers
+export Statifier,tsmlfullstat
 
 include("mlbase.jl")
 using .MLBaseWrapper
+export Standardize,standardize, standardize!, 
+       transform, estimate, transform,StandardScaler
 
 include("decisiontree.jl")
 using .DecisionTreeLearners
+export PrunedTree,RandomForest,Adaboost
 
 include("normalizer.jl")
 using .Normalizers
-
+export Normalizer
 
 include("monotonicer.jl")
 using .Monotonicers
+export Monotonicer,ismonotonic,dailyflips
 
 include("cliwrapper.jl")
 using .CLIWrappers
+export tsmlrun
 
 include("tsclassifier.jl")
 using .TSClassifiers
+export TSClassifier, getstats
 
 include("outliernicer.jl")
 using .Outliernicers
+export Outliernicer
 
 include("plotter.jl")
 using .Plotters
+export Plotter
 
 include("timescaledb.jl")
 using .TimescaleDBs
+export TimescaleDB
 
 include("demo.jl")
 using .TSMLDemo
-
-include("argparse.jl")
-using .ArgumentParsers
+export tsml_demo
 
 include("ensemble.jl")
 using .EnsembleMethods
+export VoteEnsemble, StackEnsemble, BestLearner
 
 include("schema.jl")
 using .Schemalizers
+export Schemalizer, ML, table
 
 include("crossvalidator.jl")
 using .CrossValidators
+export crossvalidate
+
+include("argparse.jl")
+using .ArgumentParsers
+export tsmlmain
 
 end # module
diff --git a/src/argparse.jl b/src/argparse.jl
@@ -1,20 +1,12 @@
-@reexport module ArgumentParsers
-
-using TSML
-using TSML.TSMLTypes
-using TSML.Utils
-
-using TSML.ValDateFilters: CSVDateValReader, CSVDateValWriter
-using TSML.Statifiers
-using TSML.Monotonicers
-using TSML.Outliernicers
-using TSML.Plotters
+module ArgumentParsers
 
 using Dates
 using DataFrames
 using CSV
 using ArgParse
 
+using TSML
+
 export tsmlmain
 
 const COMMONARG = Dict(

diff --git a/src/basefilters.jl b/src/basefilters.jl
@@ -1,4 +1,4 @@
-@reexport module BaseFilters
+module BaseFilters
 
 using Dates
 using DataFrames

diff --git a/src/baseline.jl b/src/baseline.jl
@@ -1,4 +1,4 @@
-@reexport module BaselineAlgos
+module BaselineAlgos
 
 using TSML.TSMLTypes
 using TSML.Utils
@@ -11,7 +11,6 @@ export Baseline,Identity
        fit!,
        transform!
 
-
 using StatsBase: mode
 
 

diff --git a/src/cliwrapper.jl b/src/cliwrapper.jl
@@ -1,4 +1,4 @@
-@reexport module CLIWrappers
+module CLIWrappers
 
 using TSML
 using TSML.TSMLTypes

diff --git a/src/crossvalidator.jl b/src/crossvalidator.jl
@@ -1,4 +1,4 @@
-@reexport module CrossValidators
+module CrossValidators
 
 using TSML.TSMLTypes
 using TSML.Utils

diff --git a/src/decisiontree.jl b/src/decisiontree.jl
@@ -1,20 +1,18 @@
 # Decision trees as found in DecisionTree Julia package.
-@reexport module DecisionTreeLearners
+module DecisionTreeLearners
 
 using DataFrames
 using TSML.TSMLTypes
 import TSML.TSMLTypes.fit!
 import TSML.TSMLTypes.transform!
 using TSML.Utils
 
+export fit!,transform!
+
 import DecisionTree
 DT = DecisionTree
 
-export PrunedTree, 
-       RandomForest,
-       Adaboost,
-       fit!, 
-       transform!
+export PrunedTree, RandomForest, Adaboost
 
 # Pruned CART decision tree.
 

diff --git a/src/demo.jl b/src/demo.jl
@@ -1,4 +1,4 @@
-@reexport module TSMLDemo
+module TSMLDemo
 
 using Dates
 using DataFrames

diff --git a/src/ensemble.jl b/src/ensemble.jl
@@ -1,5 +1,5 @@
 # Ensemble learning methods.
-@reexport module EnsembleMethods
+module EnsembleMethods
 
 using DataFrames
 using Statistics
@@ -16,11 +16,8 @@ import MLBase
 
 using TSML.DecisionTreeLearners
 
-export VoteEnsemble, 
-       StackEnsemble,
-       BestLearner, 
-       fit!, 
-       transform!
+export fit!, transform!
+export VoteEnsemble, StackEnsemble, BestLearner
 
 """
     VoteEnsemble(