(#2) Replace leftexpressions and rightexpressions with inflow and outflow, respectively

Author: jbytecode

src/maximumflow.jl

@@ -1,6 +1,6 @@
 module MaximumFlow
 
-import ..Network: Connection, nodes, start, finish, hassameorder, leftexpressions, rightexpressions
+import ..Network: Connection, nodes, start, finish, hassameorder, inflow, outflow
 
 using JuMP, HiGHS
 import ..OperationsResearchModels: solve
@@ -118,8 +118,8 @@ function solve(problem::MaximumFlowProblem)::MaximumFlowResult
 
     # Constraints 
     for nextnode in mynodes
-        leftexpr = leftexpressions(x, nextnode, cns, model)
-        rightexpr = rightexpressions(x, nextnode, cns, model)
+        leftexpr = inflow(x, nextnode, cns, model)
+        rightexpr = outflow(x, nextnode, cns, model)
         if leftexpr == :f
             @constraint(model, rightexpr == f)
         elseif rightexpr == :f

src/minimumcostflow.jl

@@ -3,7 +3,7 @@ module MinimumCostFlow
 using JuMP, HiGHS
 import ..OperationsResearchModels: solve
 
-import ..Network: Connection, nodes, start, finish, hassameorder, leftexpressions, rightexpressions
+import ..Network: Connection, nodes, start, finish, hassameorder, inflow, outflow
 import ..MaximumFlow: MaximumFlowProblem, MaximumFlowResult
 
 export MinimumCostFlowProblem, MinimumCostFlowResult
@@ -89,8 +89,8 @@ function solve(problem::MinimumCostFlowProblem, flow::Float64)::MinimumCostFlowR
 
     # Constraints 
     for nextnode in mynodes
-        leftexpr = leftexpressions(x, nextnode, cns, model)
-        rightexpr = rightexpressions(x, nextnode, cns, model)
+        leftexpr = inflow(x, nextnode, cns, model)
+        rightexpr = outflow(x, nextnode, cns, model)
         if leftexpr == :f
             @constraint(model, rightexpr == flow)
         elseif rightexpr == :f

src/network.jl

@@ -8,8 +8,8 @@ export iseveronleft
 export iseveronright
 export finish
 export start
-export rightexpressions
-export leftexpressions
+export inflow
+export outflow
 export hassameorder
 
 
@@ -88,7 +88,7 @@ end
 
 
 
-function rightexpressions(x::Matrix{JuMP.VariableRef}, node::Int64, nodes::Vector{Connection}, model)::Union{JuMP.AffExpr, Symbol}
+function outflow(x::Matrix{JuMP.VariableRef}, node::Int64, nodes::Vector{Connection}, model)::Union{JuMP.AffExpr, Symbol}
     lst = []
     for conn in nodes
         if conn.from == node
@@ -107,7 +107,7 @@ end
 
 
 
-function leftexpressions(x::Matrix{JuMP.VariableRef}, node::Int64, nodes::Vector{Connection}, model)::Union{JuMP.AffExpr, Symbol}
+function inflow(x::Matrix{JuMP.VariableRef}, node::Int64, nodes::Vector{Connection}, model)::Union{JuMP.AffExpr, Symbol}
     lst = []
     for conn in nodes
         if conn.to == node