The unified diff between revisions [9af6e795..] and [594720f0..] is displayed below. It can also be downloaded as a raw diff.

This diff has been restricted to the following files: 'viz_types.ml'

#
#
# patch "viz_types.ml"
#  from [fa26708f30ff98ccee703267a4d5567c9a0545c9]
#    to [000e61799446f6d11caad5379ca79c9ea6ff087e]
#
============================================================
--- viz_types.ml	fa26708f30ff98ccee703267a4d5567c9a0545c9
+++ viz_types.ml	000e61799446f6d11caad5379ca79c9ea6ff087e
@@ -12,7 +12,11 @@ type query_limit =
 type query_limit =
   | QUERY_NO_LIMIT
   | QUERY_BETWEEN of date * date
-type query = query_domain * query_limit
+type query = {
+    dom : query_domain ;
+    lim : query_limit ;
+    all_propagates : bool
+  }

 type select_info = { query : query; preselect : string option; }

@@ -44,11 +48,19 @@ type a_node = {
 type relation = PARENT | CHILD

 type a_node = {
-    id       : string ;
-    kind     : node_kind ;
-    family   : (string * relation) list ;
+            id       : string ;
+    mutable kind     : node_kind ;
+    mutable family   : (string * relation) list ;
   }

+let neighbour_kind = function
+  | NEIGHBOUR_IN
+  | NEIGHBOUR_OUT -> true
+  | REGULAR
+  | MERGE
+  | DISAPPROVE
+  | TAGGED _ -> false
+
 type node_data = {
     revision_id  : string ;
     manifest_id  : string ;
@@ -57,15 +69,15 @@ type edge_kind =
   }

 type edge_kind =
-  | BRANCHING
   | SAME_BRANCH
   | DISAPPROVED
+  | BRANCHING
+  | BRANCHING_NEIGH
   | SPANNING

 type agraph = {
   nodes           : a_node NodeMap.t ;
   ancestry        : edge_kind EdgeMap.t ;
-  neighbour_nodes : IdSet.t ;
 }

 type c_node = {
@@ -90,8 +102,7 @@ let empty_agraph = { nodes = NodeMap.emp
 }

 let empty_agraph = { nodes = NodeMap.empty;
-		     ancestry = EdgeMap.empty;
-		     neighbour_nodes = IdSet.empty }
+		     ancestry = EdgeMap.empty }
 let empty_cgraph = { bb = (0., 0., 0., 0.);
 		     c_nodes = NodeMap.empty ;
 		     c_edges = EdgeMap.empty }