Merge 1a95b83 into 3956894

mschauer · Dec 3, 2018 · 6dcea04 · 6dcea04
2 parents 3956894 + 1a95b83
commit 6dcea04
Show file tree

Hide file tree

Showing 11 changed files with 625 additions and 9 deletions.
diff --git a/REQUIRE b/REQUIRE
@@ -5,4 +5,5 @@ Distributions
 Tables
 SpecialFunctions
 NearestNeighbors
-Distances
+Distances
+MetaGraphs
diff --git a/docs/src/library.md b/docs/src/library.md
@@ -35,6 +35,18 @@ kl_cond_mi
 kl_perm_mi_test
 kl_perm_cond_mi_test
 ```
+## FCI algorithm
+```@docs
+has_marks
+set_marks!
+is_collider
+is_parent
+is_triangle
+is_discriminating_path
+isUncoveredCirclePath
+isUncoveredPDPath
+fcialg
+```
 
 ## Miscellaneous
 ```@docs

diff --git a/src/CausalInference.jl b/src/CausalInference.jl
@@ -11,13 +11,16 @@ export digraph, vpairs, skel_oracle, pc_oracle, randdag
 export cmitest, kl_entropy, kl_renyi, kl_mutual_information
 export kl_cond_mi, kl_perm_mi_test, kl_perm_cond_mi_test
 export n_ball
+export fcialg, is_collider, is_triangle, is_parent
+export is_discriminating_path, has_marks, set_marks!, isUncoveredCirclePath
+export isUncoveredPDPath, @arrow_str
 
 include("klentropy.jl")
 include("skeleton.jl")
 include("dsep.jl")
 include("pc.jl")
 include("cpdag.jl")
-
+include("fci.jl")
 include("misc.jl")
 
 end # module
diff --git a/src/dsep.jl b/src/dsep.jl
@@ -13,7 +13,7 @@ function dsep(g::AbstractGraph, u::Integer, v::Integer, S; verbose = false)
     descendant = falses(nv(g)) # descendant in s
     blocked = falses(nv(g))
 
-    for ve in S 
+    for ve in S
         in_seen[ve] = true
         blocked[ve] = true
     end