-
Notifications
You must be signed in to change notification settings - Fork 8
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
[ENH, MAINT] Refactor directed-undirected graph class #72
base: main
Are you sure you want to change the base?
Changes from all commits
7a57e01
328a656
1d3e990
7800aee
d7f71b1
79f7457
7d69f7f
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,7 @@ | ||
from ._version import __version__ # noqa: F401 | ||
from .classes import ( | ||
ADMG, | ||
CG, | ||
CPDAG, | ||
PAG, | ||
AugmentedGraph, | ||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,4 @@ | ||
from .cg import * # noqa: F403 | ||
from .cyclic import * # noqa: F403 | ||
from .generic import * # noqa: F403 | ||
from .pag import * # noqa: F403 |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,86 @@ | ||
import copy | ||
from collections import OrderedDict, deque | ||
|
||
from pywhy_graphs import CG | ||
|
||
__all__ = ["is_valid_cg"] | ||
|
||
|
||
def is_valid_cg(graph: CG): | ||
""" | ||
Checks if a supplied chain graph is valid. | ||
|
||
This implements the original definition of a (Lauritzen Wermuth Frydenberg) chain graph as | ||
presented in [1]_. | ||
|
||
Define a cycle as a series of nodes X_1 -o X_2 ... X_n -o X_1 where the edges may be directed or | ||
undirected. Note that directed edges in a cycle must all be aligned in the same direction. A | ||
chain graph may only contain cycles consisting of only undirected edges. Equivalently, a chain | ||
graph does not contain any cycles with one or more directed edges. | ||
|
||
Parameters | ||
__________ | ||
graph : CG | ||
The graph. | ||
|
||
Returns | ||
_______ | ||
is_valid : bool | ||
Whether supplied `graph` is a valid chain graph. | ||
|
||
References | ||
---------- | ||
.. [1] Frydenberg, Morten. “The Chain Graph Markov Property.” Scandinavian Journal of | ||
Statistics, vol. 17, no. 4, 1990, pp. 333–53. JSTOR, http://www.jstor.org/stable/4616181. | ||
Accessed 15 Apr. 2023. | ||
|
||
|
||
""" | ||
|
||
# Check if directed edges are acyclic | ||
undirected_edge_name = graph.undirected_edge_name | ||
directed_edge_name = graph.directed_edge_name | ||
all_nodes = graph.nodes() | ||
G_undirected = graph.get_graphs(edge_type=undirected_edge_name) | ||
G_directed = graph.get_graphs(edge_type=directed_edge_name) | ||
|
||
# Search over all nodes. | ||
for v in all_nodes: | ||
queue = deque([]) | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add a type annotation to There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Can do - also I have the pre-commit hooks PR which is open for review which will help me catch this :))) |
||
# Fill queue with paths from v starting with outgoing directed edge | ||
# OrderedDict used for O(1) set membership and ordering | ||
for _, z in G_directed.out_edges(nbunch=v): | ||
d = OrderedDict() | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Add a type annotation to |
||
d[v] = None | ||
d[z] = None | ||
queue.append(d) | ||
|
||
while queue: | ||
# For each path in queue, progress along edges in certain | ||
# manner | ||
path = queue.popleft() | ||
rev_path = reversed(path) | ||
last_added = next(rev_path) | ||
second_last_added = next(rev_path) | ||
|
||
# For directed edges progress is allowed for outgoing edges | ||
# only | ||
for _, node in G_directed.out_edges(nbunch=last_added): | ||
if node in path: | ||
return False | ||
new_path = copy.deepcopy(path) | ||
new_path[node] = None | ||
queue.append(new_path) | ||
|
||
# For undirected edges, progress is allowed for neighbors | ||
# which were not visited. E.g. if the path is currently A - B, | ||
# do not consider adding A when iterating over neighbors of B. | ||
for node in G_undirected.neighbors(last_added): | ||
if node != second_last_added: | ||
if node in path: | ||
return False | ||
new_path = copy.deepcopy(path) | ||
new_path[node] = None | ||
queue.append(new_path) | ||
|
||
return True |
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,124 @@ | ||
import pytest | ||
|
||
from pywhy_graphs import CG | ||
from pywhy_graphs.algorithms import is_valid_cg | ||
|
||
|
||
@pytest.fixture | ||
def cg_simple_partially_directed_cycle(): | ||
graph = CG() | ||
graph.add_nodes_from(["A", "B", "C", "D"]) | ||
graph.add_edge("A", "B", graph.directed_edge_name) | ||
graph.add_edge("D", "C", graph.directed_edge_name) | ||
graph.add_edge("B", "D", graph.undirected_edge_name) | ||
graph.add_edge("A", "C", graph.undirected_edge_name) | ||
|
||
return graph | ||
|
||
|
||
@pytest.fixture | ||
def cg_multiple_blocks_partially_directed_cycle(): | ||
|
||
graph = CG() | ||
graph.add_nodes_from(["A", "B", "C", "D", "E", "F", "G"]) | ||
graph.add_edge("A", "B", graph.directed_edge_name) | ||
graph.add_edge("D", "C", graph.directed_edge_name) | ||
graph.add_edge("B", "D", graph.undirected_edge_name) | ||
graph.add_edge("A", "C", graph.undirected_edge_name) | ||
graph.add_edge("E", "F", graph.undirected_edge_name) | ||
graph.add_edge("F", "G", graph.undirected_edge_name) | ||
graph.add_edge("G", "E", graph.undirected_edge_name) | ||
|
||
return graph | ||
|
||
|
||
@pytest.fixture | ||
def square_graph(): | ||
graph = CG() | ||
graph.add_nodes_from(["A", "B", "C", "D"]) | ||
graph.add_edge("A", "B", graph.undirected_edge_name) | ||
graph.add_edge("B", "C", graph.undirected_edge_name) | ||
graph.add_edge("C", "D", graph.undirected_edge_name) | ||
graph.add_edge("C", "A", graph.undirected_edge_name) | ||
|
||
return graph | ||
|
||
|
||
@pytest.fixture | ||
def fig_g1_frydenberg(): | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Perhaps add a docstring and a link to the reference for all the fixtures that come from some paper, so its back traceable? There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. yes that's a good idea, i have the reference in the function but not the test |
||
graph = CG() | ||
graph.add_nodes_from(["a", "b", "g", "m", "d"]) | ||
graph.add_edge("a", "b", graph.undirected_edge_name) | ||
graph.add_edge("b", "g", graph.directed_edge_name) | ||
graph.add_edge("g", "d", graph.undirected_edge_name) | ||
graph.add_edge("d", "m", graph.undirected_edge_name) | ||
graph.add_edge("a", "m", graph.directed_edge_name) | ||
|
||
return graph | ||
|
||
|
||
@pytest.fixture | ||
def fig_g2_frydenberg(): | ||
graph = CG() | ||
graph.add_nodes_from(["b", "g", "d", "m", "a"]) | ||
graph.add_edge("a", "m", graph.directed_edge_name) | ||
graph.add_edge("m", "g", graph.undirected_edge_name) | ||
graph.add_edge("m", "d", graph.directed_edge_name) | ||
graph.add_edge("g", "d", graph.directed_edge_name) | ||
graph.add_edge("b", "g", graph.directed_edge_name) | ||
|
||
return graph | ||
|
||
|
||
@pytest.fixture | ||
def fig_g3_frydenberg(): | ||
graph = CG() | ||
graph.add_nodes_from(["a", "b", "g"]) | ||
graph.add_edge("b", "a", graph.undirected_edge_name) | ||
graph.add_edge("a", "g", graph.undirected_edge_name) | ||
graph.add_edge("b", "g", graph.directed_edge_name) | ||
|
||
return graph | ||
|
||
|
||
@pytest.fixture | ||
def fig_g4_frydenberg(): | ||
graph = CG() | ||
graph.add_nodes_from(["b", "g", "d", "m", "a"]) | ||
graph.add_edge("b", "g", graph.directed_edge_name) | ||
graph.add_edge("a", "b", graph.undirected_edge_name) | ||
graph.add_edge("g", "d", graph.undirected_edge_name) | ||
graph.add_edge("d", "m", graph.undirected_edge_name) | ||
graph.add_edge("m", "a", graph.undirected_edge_name) | ||
graph.add_edge("a", "g", graph.directed_edge_name) | ||
|
||
return graph | ||
|
||
|
||
@pytest.mark.parametrize( | ||
"G", | ||
[ | ||
"cg_simple_partially_directed_cycle", | ||
"cg_multiple_blocks_partially_directed_cycle", | ||
"fig_g3_frydenberg", | ||
"fig_g4_frydenberg", | ||
], | ||
) | ||
def test_graphs_are_not_valid_cg(G, request): | ||
graph = request.getfixturevalue(G) | ||
|
||
assert not is_valid_cg(graph) | ||
|
||
|
||
@pytest.mark.parametrize( | ||
"G", | ||
[ | ||
"square_graph", | ||
"fig_g1_frydenberg", | ||
"fig_g2_frydenberg", | ||
], | ||
) | ||
def test_graphs_are_valid_cg(G, request): | ||
graph = request.getfixturevalue(G) | ||
|
||
assert is_valid_cg(graph) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Typically change log goes on the bottom. I think the Changelog CI check should get fixed that way
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
oh fair enough I was just following https://keepachangelog.com/en/1.0.0/ which has everything in reverse chronological order