Interface update

README.md

@@ -14,30 +14,36 @@ We can create an influence diagram as follows:
 
 ```julia
 using DecisionProgramming
-S = States([2, 2, 2, 2])
-C = [ChanceNode(2, [1]), ChanceNode(3, [1])]
-D = [DecisionNode(1, Node[]), DecisionNode(4, [2, 3])]
-V = [ValueNode(5, [4])]
-X = [Probabilities(2, [0.4 0.6; 0.6 0.4]), Probabilities(3, [0.7 0.3; 0.3 0.7])]
-Y = [Consequences(5, [1.5, 1.7])]
-validate_influence_diagram(S, C, D, V)
-sort!.((C, D, V, X, Y), by = x -> x.j)
-P = DefaultPathProbability(C, X)
-U = DefaultPathUtility(V, Y)
+
+diagram = InfluenceDiagram()
+
+add_node!(diagram, DecisionNode("A", [], ["a", "b"]))
+add_node!(diagram, DecisionNode("D", ["B", "C"], ["k", "l"]))
+add_node!(diagram, ChanceNode("B", ["A"], ["x", "y"]))
+add_node!(diagram, ChanceNode("C", ["A"], ["v", "w"]))
+add_node!(diagram, ValueNode("V", ["D"]))
+
+generate_arcs!(diagram)
+
+add_probabilities!(diagram, "B", [0.4 0.6; 0.6 0.4])
+add_probabilities!(diagram, "C", [0.7 0.3; 0.3 0.7])
+add_utilities!(diagram, "V", [1.5, 1.7])
+
+generate_diagram!(diagram)
 ```
 
 Using the influence diagram, we create the decision model as follow:
 
 ```julia
 using JuMP
 model = Model()
-z = DecisionVariables(model, S, D)
-x_s = PathCompatibilityVariables(model, z, S, P)
-EV = expected_value(model, x_s, U, P)
+z = DecisionVariables(model, diagram)
+x_s = PathCompatibilityVariables(model, diagram, z)
+EV = expected_value(model, diagram, x_s)
 @objective(model, Max, EV)
 ```
 
-Finally, we can optimize the model using MILP solver.
+We can optimize the model using MILP solver.
 
 ```julia
 using Gurobi

docs/src/api.md

@@ -1,25 +1,27 @@
 # API Reference
 `DecisionProgramming.jl` API reference.
 
+
 ## `influence_diagram.jl`
 ### Nodes
 ```@docs
 Node
+Name
+AbstractNode
 ChanceNode
 DecisionNode
 ValueNode
 State
 States
-States(::Vector{Tuple{State, Vector{Node}}})
-validate_influence_diagram
 ```
 
 ### Paths
 ```@docs
 Path
-paths(::AbstractVector{State})
-paths(::AbstractVector{State}, ::Dict{Node, State})
 ForbiddenPath
+FixedPath
+paths(::AbstractVector{State})
+paths(::AbstractVector{State}, FixedPath)
 ```
 
 ### Probabilities
@@ -33,9 +35,10 @@ AbstractPathProbability
 DefaultPathProbability
 ```
 
-### Consequences
+### Utilities
 ```@docs
-Consequences
+Utility
+Utilities
 ```
 
 ### Path Utility
@@ -44,6 +47,18 @@ AbstractPathUtility
 DefaultPathUtility
 ```
 
+### InfluenceDiagram
+InfluenceDiagram
+generate_arcs!
+generate_diagram!
+add_node!
+ProbabilityMatrix
+set_probability!
+add_probabilities!
+UtilityMatrix
+set_utility!
+add_utilities!
+
 ### Decision Strategy
 ```@docs
 LocalDecisionStrategy
@@ -61,10 +76,8 @@ lazy_probability_cut(::Model, ::PathCompatibilityVariables, ::AbstractPathProbab
 
 ### Objective Functions
 ```@docs
-PositivePathUtility
-NegativePathUtility
-expected_value(::Model, ::PathCompatibilityVariables, ::AbstractPathUtility, ::AbstractPathProbability; ::Float64)
-conditional_value_at_risk(::Model, ::PathCompatibilityVariables{N}, ::AbstractPathUtility, ::AbstractPathProbability, ::Float64; ::Float64) where N
+expected_value(::Model, ::InfluenceDiagram, ::PathCompatibilityVariables; ::Float64)
+conditional_value_at_risk(::Model, ::InfluenceDiagram, ::PathCompatibilityVariables{N}, ::Float64; ::Float64) where N
 ```
 
 ### Decision Strategy from Variables
@@ -76,13 +89,14 @@ DecisionStrategy(::DecisionVariables)
 ## `analysis.jl`
 ```@docs
 CompatiblePaths
+CompatiblePaths(::InfluenceDiagram, ::DecisionStrategy, ::FixedPath)
 UtilityDistribution
-UtilityDistribution(::States, ::AbstractPathProbability, ::AbstractPathUtility, ::DecisionStrategy)
+UtilityDistribution(::InfluenceDiagram, ::DecisionStrategy)
 StateProbabilities
-StateProbabilities(::States, ::AbstractPathProbability, ::DecisionStrategy)
-StateProbabilities(::States, ::AbstractPathProbability, ::DecisionStrategy, ::Node, ::State, ::StateProbabilities)
-value_at_risk(::Vector{Float64}, ::Vector{Float64}, ::Float64)
-conditional_value_at_risk(::Vector{Float64}, ::Vector{Float64}, ::Float64)
+StateProbabilities(::InfluenceDiagram, ::DecisionStrategy)
+StateProbabilities(::InfluenceDiagram, ::DecisionStrategy, ::Name, ::Name, ::StateProbabilities)
+value_at_risk(::UtilityDistribution, ::Float64)
+conditional_value_at_risk(::UtilityDistribution, ::Float64)
 ```
 
 ## `printing.jl`