Try to make functions generic
This commit is contained in:
parent
2cad93c7ff
commit
47b6b621f9
2 changed files with 32 additions and 5 deletions
33
src/tools.ml
33
src/tools.ml
|
|
@ -12,12 +12,14 @@ let add_arc graph id1 id2 n =
|
|||
| Some arc -> new_arc graph {src=arc.src; tgt=arc.tgt; lbl=arc.lbl+n}
|
||||
|
||||
let create_flow_graph graph = gmap graph (fun _ -> 0)
|
||||
|
||||
let create_flow_graph_2 graph = gmap (gmap graph (fun _ -> 0)) (fun n -> (n : 'a))
|
||||
|
||||
let update_flow_graph : int graph -> (int arc -> bool) -> (int arc -> bool) -> int -> int graph =
|
||||
fun original_graph condition backward_condition increment ->
|
||||
let new_graph =
|
||||
fun original_flow_graph condition backward_condition increment ->
|
||||
let new_flow_graph =
|
||||
e_fold
|
||||
original_graph
|
||||
original_flow_graph
|
||||
(fun acc_graph arc ->
|
||||
let modified_arc =
|
||||
if condition arc then
|
||||
|
|
@ -28,9 +30,30 @@ let update_flow_graph : int graph -> (int arc -> bool) -> (int arc -> bool) -> i
|
|||
arc
|
||||
in
|
||||
new_arc acc_graph modified_arc)
|
||||
original_graph
|
||||
original_flow_graph
|
||||
in
|
||||
new_graph
|
||||
new_flow_graph
|
||||
|
||||
(* let update_flow_graph_2 : 'a graph -> ('a arc -> bool) -> ('a arc -> bool) -> 'a -> 'a graph =
|
||||
fun original_flow_graph condition backward_condition increment ->
|
||||
let original_flow_graph_int = gmap original_flow_graph (fun arc -> { arc with lbl = (arc.lbl : int) }) in
|
||||
let increment_int = fun value -> (value : int) in
|
||||
let new_flow_graph =
|
||||
e_fold
|
||||
original_flow_graph_int
|
||||
(fun acc_graph arc ->
|
||||
let modified_arc =
|
||||
if condition arc then
|
||||
{ arc with lbl = arc.lbl + increment_int }
|
||||
else if backward_condition arc then
|
||||
{ arc with lbl = arc.lbl - increment_int }
|
||||
else
|
||||
arc
|
||||
in
|
||||
new_arc acc_graph modified_arc)
|
||||
original_flow_graph_int
|
||||
in
|
||||
new_flow_graph *)
|
||||
|
||||
let check_if_arc_is_in_path : int arc -> int list -> bool =
|
||||
fun arc path ->
|
||||
|
|
|
|||
|
|
@ -9,8 +9,12 @@ val add_arc: int graph -> id -> id -> int -> int graph
|
|||
(* try not to lose genericity *)
|
||||
val create_flow_graph: 'a graph -> int graph
|
||||
|
||||
val create_flow_graph_2: 'a graph -> 'a graph
|
||||
|
||||
val update_flow_graph : int graph -> (int arc -> bool) -> (int arc -> bool) -> int -> int graph
|
||||
|
||||
(* val update_flow_graph_2 : 'a graph -> ('a arc -> bool) -> ('a arc -> bool) -> 'a -> 'a graph *)
|
||||
|
||||
val check_if_arc_is_in_path : int arc -> int list -> bool
|
||||
|
||||
val check_if_backward_arc_is_in_path : int arc -> int list -> bool
|
||||
|
|
|
|||
Loading…
Reference in a new issue