Skip to content

Commit

Permalink
Merge pull request sisl#108 from sisl/moss/coverage
Browse files Browse the repository at this point in the history
Fix coverage and better GraphPlot styles
  • Loading branch information
mossr committed Aug 6, 2020
2 parents 43d415e + 2e89e84 commit e4b922f
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 5 deletions.
4 changes: 2 additions & 2 deletions Project.toml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
name = "BayesNets"
uuid = "ba4760a4-c768-5bed-964b-cf806dc591cb"
version = "3.3.0"
version = "3.3.1"

[deps]
DataFrames = "a93c6f00-e57d-5684-b7b6-d8193f3e46c0"
Expand Down Expand Up @@ -28,7 +28,7 @@ DataFrames = "0.21"
DataStructures = "0.11,0.12,0.13,0.14,0.15,0.16,0.17"
Discretizers = "3.0"
Distributions = "0.17,0.18,0.19,0.20,0.21,0.22,0.23"
GraphPlot = "0.4,0.4.1"
GraphPlot = "0.3,0.3.1,0.4,0.4.1"
IterTools = "1.3"
LightGraphs = "1.0"
LightXML = "0.8,0.9"
Expand Down
2 changes: 1 addition & 1 deletion src/BayesNets.jl
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ import Base: *, /, +, -
import DataStructures: PriorityQueue, peek
import BayesNets.CPDs.ProbabilisticGraphicalModels: markov_blanket, is_independent, infer
import StatsBase: sample, Weights
import GraphPlot: gplot
import GraphPlot: gplot, stressmajorize_layout
import LightGraphs: DiGraph, add_edge!, rem_edge!,
add_vertex!, rem_vertex!, has_edge,
edges, topological_sort_by_dfs, inneighbors,
Expand Down
2 changes: 1 addition & 1 deletion src/DiscreteBayesNet/greedy_thick_thinning.jl
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@

type GreedyThickThinning <: GraphSearchStrategy
mutable struct GreedyThickThinning <: GraphSearchStrategy
cache::ScoreComponentCache
max_n_parents::Int
prior::DirichletPrior
Expand Down
8 changes: 7 additions & 1 deletion src/io.jl
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,13 @@ lualatex_available() = try success(`lualatex -v`) catch; false end
Base.showable(::MIME"image/svg+xml", bn::BayesNet) = true


plot(dag::DAG, nodelabel) = gplot(dag, nodelabel=nodelabel) # GraphPlot (default)
plot(dag::DAG, nodelabel) = gplot(dag,
nodelabel=nodelabel,
layout=stressmajorize_layout,
nodefillc="lightgray",
edgestrokec="black",
EDGELINEWIDTH=0.3) # GraphPlot (default plotting)


# called at runtime (replaces plot with TikzGraphs, if loaded)
function __init__()
Expand Down

0 comments on commit e4b922f

Please sign in to comment.