Dev

Project.toml

@@ -4,7 +4,7 @@ authors = [ "Peter Thestrup Waade [email protected]",
             "Anna Hedvig Møller [email protected]",
             "Jacopo Comoglio [email protected]",
             "Christoph Mathys [email protected]"]
-version = "0.5.4"
+version = "0.5.5"
 
 
 [deps]
@@ -13,7 +13,7 @@ Distributions = "31c24e10-a181-5473-b8eb-7969acd0382f"
 RecipesBase = "3cdcf5f2-1ef4-517c-9805-6587b60abb01"
 
 [compat]
-ActionModels = "0.5"
+ActionModels = "0.6"
 Distributions = "0.25"
 RecipesBase = "1"
 julia = "1.10"

docs/make.jl

@@ -3,7 +3,7 @@ using Documenter
 using Literate
 
 
-hgf_path = dirname(dirname(pathof(HierarchicalGaussianFiltering)))
+hgf_path = dirname(pathof(HierarchicalGaussianFiltering))
 
 juliafiles_path = hgf_path * "/docs/julia_files"
 user_guides_path = juliafiles_path * "/user_guide"

src/ActionModels_variations/utils/get_history.jl

@@ -85,32 +85,20 @@ end
 
 function ActionModels.get_history(node::AbstractNode)
 
-    #Initialize dictionary
-    state_histories = Dict()
-
-    #Go through all states in the node's history
-    for state_key in fieldnames(typeof(node.history))
+    #Get the node's name and history
+    node_name = node.name
+    node_history = node.history
 
-        #And add their histories to the output
-        state_histories[String(state_key)] = getproperty(node.history, state_key)
+    #Return a dictionary of the node's history
+    Dict((node_name,string(key))=>getfield(node_history, key) for key ∈ fieldnames(typeof(node_history)))
 
-    end
-
-    return state_histories
 end
 
 function ActionModels.get_history(hgf::HGF)
 
-    #Initialize dict for state histories
-    state_histories = Dict()
-
-    #For each node
-    for node in hgf.ordered_nodes.all_nodes
-        #Get out the histories of the node
-        node_histories = get_history(node)
-        #And merge them with the dict
-        merge(state_histories, node_histories)
-    end
+    #Get the histories of all nodes
+    merge(
+        [get_history(node) for node in hgf.ordered_nodes.all_nodes]...
+        )
 
-    return state_histories
 end

src/ActionModels_variations/utils/get_states.jl

@@ -100,38 +100,27 @@ function ActionModels.get_states(hgf::HGF, node_name::String)
         throw(ArgumentError("The node $node_name does not exist"))
     end
 
-    #Initialize dict
-    states = Dict()
-
-    #Get out the node
-    node = hgf.all_nodes[node_name]
+    #Get the states of the node
+    node = get_states(hgf.all_nodes[node_name])
+end
 
-    #For each state in the node
-    for state_key in fieldnames(typeof(node.states))
+function ActionModels.get_states(node::AbstractNode)
 
-        #Add it to the dictionary
-        states[(node_name, String(state_key))] = get_states(node, String(state_key))
+    #Get the node's name and states
+    node_name = node.name
+    node_states = node.states
 
-    end
+    #Return a dictionary of the node's states
+    Dict((node_name,string(key))=>getfield(node_states, key) for key ∈ fieldnames(typeof(node_states)))
 
-    #Get its states
-    return states
 end
 
-
 ### For getting all states of an HGF ###
 function ActionModels.get_states(hgf::HGF)
 
-    #Initialize dict for state states
-    states = Dict()
-
-    #For each node
-    for node_name in keys(hgf.all_nodes)
-        #Get out the states of the node
-        node_states = get_states(hgf, node_name)
-        #And merge them with the dict
-        states = merge(states, node_states)
-    end
-
-    return states
+    #Get the states of all nodes
+    merge(
+        [get_states(node) for node in hgf.ordered_nodes.all_nodes]...
+        )
+
 end