(#2) Update examples in the network models

Author: jbytecode

src/maximumflow.jl

@@ -82,15 +82,15 @@ julia> result = solve(problem);
 
 julia> result.path
 9-element Vector{Connection}:
- Connection(1, 2, 3.0, "x12")
- Connection(1, 3, 2.0, "x13")
- Connection(1, 4, 2.0, "x14")
- Connection(2, 5, 3.0, "x25")
- Connection(3, 5, 1.0, "x35")
- Connection(3, 6, 1.0, "x36")
- Connection(4, 6, 2.0, "x46")
- Connection(5, 7, 4.0, "x57")
- Connection(6, 7, 3.0, "x67")
+ Connection(1, 2, 3.0)
+ Connection(1, 3, 2.0)
+ Connection(1, 4, 2.0)
+ Connection(2, 5, 3.0)
+ Connection(3, 5, 1.0)
+ Connection(3, 6, 1.0)
+ Connection(4, 6, 2.0)
+ Connection(5, 7, 4.0)
+ Connection(6, 7, 3.0)
 
 julia> result.flow
 7.0

src/mst.jl

@@ -149,22 +149,22 @@ julia> conns = Connection[
                    ]
 
 4-element Vector{Connection}:
- Connection(1, 2, 10, "x12")
- Connection(2, 3, 10, "x23")
- Connection(3, 4, 10, "x34")
- Connection(1, 4, 10, "x14")
+ Connection(1, 2, 10)
+ Connection(2, 3, 10)
+ Connection(3, 4, 10)
+ Connection(1, 4, 10)
 
  julia> result = solve(MstProblem(conns))
- MstResult(Connection[Connection(3, 4, 10, "x34"), Connection(1, 4, 10, "x14"), Connection(2, 3, 10, "x23")], 30.0)
+ MstResult(Connection[Connection(3, 4, 10), Connection(1, 4, 10), Connection(2, 3, 10)], 30.0)
  
  julia> result.distance
  30.0
  
  julia> result.connections
  3-element Vector{Connection}:
-  Connection(3, 4, 10, "x34")
-  Connection(1, 4, 10, "x14")
-  Connection(2, 3, 10, "x23")
+  Connection(3, 4, 10)
+  Connection(1, 4, 10)
+  Connection(2, 3, 10)
 ```
 """
 function solve(problem::MstProblem)::MstResult

src/shortestpath.jl

@@ -82,9 +82,9 @@ julia> solve(ShortestPathProblem(conns));
 
 julia> result.path
 3-element Vector{Connection}:
- Connection(1, 3, 2, "x13")
- Connection(3, 6, 1, "x36")
- Connection(6, 7, 5, "x67")
+ Connection(1, 3, 2)
+ Connection(3, 6, 1)
+ Connection(6, 7, 5)
 
 julia> result.cost
 8.0
@@ -94,7 +94,7 @@ function solve(problem::ShortestPathProblem)
 
     cns = problem.connections
 
-    function leftexpressions(node::Int64, nodes::Vector{Connection}, model)
+    function inflow(node::Int64, nodes::Vector{Connection}, model)
         lst = []
         for conn in nodes
             if conn.to == node
@@ -111,7 +111,7 @@ function solve(problem::ShortestPathProblem)
         return expr
     end
 
-    function rightexpressions(node::Int64, nodes::Vector{Connection}, model)
+    function outflow(node::Int64, nodes::Vector{Connection}, model)
         lst = []
         for conn in nodes
             if conn.from == node
@@ -150,8 +150,8 @@ function solve(problem::ShortestPathProblem)
 
     # Constraints 
     for nextnode in mynodes
-        leftexpr = leftexpressions(nextnode, cns, model)
-        rightexpr = rightexpressions(nextnode, cns, model)
+        leftexpr = inflow(nextnode, cns, model)
+        rightexpr = outflow(nextnode, cns, model)
         if nextnode in [startnode, finishnode]
             @constraint(model, leftexpr + rightexpr == 1)
         else