From 1061b7df8df1fca822ec0454775894d2615fdcee Mon Sep 17 00:00:00 2001 From: Guy Van den Broeck Date: Sat, 25 Sep 2021 21:21:43 -0700 Subject: [PATCH] cleanup --- src/ProbabilisticCircuits.jl | 4 ++-- src/{FactorGraph => factor_graph}/factor_graph.jl | 0 src/{FactorGraph => factor_graph}/fg_compile.jl | 0 src/io/clt_io.jl | 1 + src/io/ensemble_io.jl | 2 ++ 5 files changed, 5 insertions(+), 2 deletions(-) rename src/{FactorGraph => factor_graph}/factor_graph.jl (100%) rename src/{FactorGraph => factor_graph}/fg_compile.jl (100%) diff --git a/src/ProbabilisticCircuits.jl b/src/ProbabilisticCircuits.jl index d56feae1..0f9c9149 100644 --- a/src/ProbabilisticCircuits.jl +++ b/src/ProbabilisticCircuits.jl @@ -22,8 +22,8 @@ export twenty_datasets include("Utils/Utils.jl") @reexport using .Utils -include("FactorGraph/factor_graph.jl") -include("FactorGraph/fg_compile.jl") +include("factor_graph/factor_graph.jl") +include("factor_graph/fg_compile.jl") include("abstract_prob_nodes.jl") include("shared_prob_nodes.jl") diff --git a/src/FactorGraph/factor_graph.jl b/src/factor_graph/factor_graph.jl similarity index 100% rename from src/FactorGraph/factor_graph.jl rename to src/factor_graph/factor_graph.jl diff --git a/src/FactorGraph/fg_compile.jl b/src/factor_graph/fg_compile.jl similarity index 100% rename from src/FactorGraph/fg_compile.jl rename to src/factor_graph/fg_compile.jl diff --git a/src/io/clt_io.jl b/src/io/clt_io.jl index f1ffa80f..ffcb4e81 100644 --- a/src/io/clt_io.jl +++ b/src/io/clt_io.jl @@ -7,6 +7,7 @@ using Pkg.Artifacts # circuit loaders from module zoo ##################### +# TODO move this to a Lerche.jl parser and use Base.{read,parse} zoo_clt_file(name) = artifact"circuit_model_zoo" * LogicCircuits.zoo_version * "/clts/$name" diff --git a/src/io/ensemble_io.jl b/src/io/ensemble_io.jl index aaf284e5..f7cc1251 100644 --- a/src/io/ensemble_io.jl +++ b/src/io/ensemble_io.jl @@ -1,5 +1,7 @@ export load_as_ensemble, save_as_ensemble +# TODO transition this to a Lerche.jl parser and use Base.{read,parse} + "Loads an ensemble from disk." function load_as_ensemble(name::String; quiet::Bool = false)::Ensemble{StructProbCircuit} @assert endswith(name, ".esbl")