new module Merge

Author: signoles

CHANGES

@@ -1,4 +1,6 @@
 
+ o new module Merge implementing several different of merges of vertices and
+   edges into a graph (contributed by Emmanuel Haucourt)
  o fixed DOT parser (contributed by Alex Reece)
  o Topological: fixed bug in presence of disjoint cycles; new implementation
  o new module [Graphml] to export graphs into the graphml format

Makefile.in

@@ -72,7 +72,7 @@ CMO = 	version util blocks persistent imperative \
 	components path nonnegative traverse coloring topological kruskal flow \
         dominator graphviz gml dot_parser dot_lexer dot pack \
 	gmap minsep cliquetree mcs_m md strat fixpoint leaderlist contraction \
-	graphml
+	graphml merge
 CMO := $(LIB) $(patsubst %, $(SRCDIR)/%.cmo, $(CMO))
 
 CMX = $(CMO:.cmo=.cmx)

src/builder.ml

@@ -15,8 +15,6 @@
 (*                                                                        *)
 (**************************************************************************)
 
-(* $Id: builder.ml,v 1.12 2004-02-20 14:37:40 signoles Exp $ *)
-
 open Sig
 
 module type S = sig
@@ -56,3 +54,9 @@ module I(G : Sig.I) = struct
   let remove_edge g v1 v2 = G.remove_edge g v1 v2; g
   let remove_edge_e g e = G.remove_edge_e g e; g
 end
+
+(*
+Local Variables:
+compile-command: "make -C .."
+End:
+*)

src/builder.mli

@@ -15,8 +15,6 @@
 (*                                                                        *)
 (**************************************************************************)
 
-(* $Id: builder.mli,v 1.13 2004-02-20 14:37:40 signoles Exp $ *)
-
 (** Graph builders in order to persistent/imperative graphs sharing a same
     signature. *)
 
@@ -49,3 +47,9 @@ module P(G : Sig.P) : S with module G = G
 
 module I(G : Sig.I) : S with module G = G
   (** Imperative Graphs Builders. *)
+
+(*
+Local Variables:
+compile-command: "make -C .."
+End:
+*)

src/cliquetree.ml

@@ -15,8 +15,6 @@
 (*                                                                        *)
 (**************************************************************************)
 
-(*i $Id: cliquetree.ml,v 1.6 2005-11-02 13:43:35 filliatr Exp $ i*)
-
 module CliqueTree(Gr : Sig.G) = struct
 
   (* Original vertex set (of Gr) *)

src/cliquetree.mli

@@ -15,8 +15,6 @@
 (*                                                                        *)
 (**************************************************************************)
 
-(*i $Id: cliquetree.mli,v 1.4 2004-10-19 15:22:47 signoles Exp $ i*)
-
 (** Construction of the clique tree of a graph and recognition
     of chordal graphs.
   

src/gmap.ml

@@ -15,8 +15,6 @@
 (*                                                                        *)
 (**************************************************************************)
 
-(* $Id: gmap.ml,v 1.1 2004-10-20 09:59:56 signoles Exp $ *)
-
 (** {2 Mapping of vertices} *)
 
 module type V_SRC = sig

src/gmap.mli

@@ -15,8 +15,6 @@
 (*                                                                        *)
 (**************************************************************************)
 
-(* $Id: gmap.mli,v 1.1 2004-10-20 09:59:56 signoles Exp $ *)
-
 (** Graph mapping. Map a graph to another one. *)
 
 (** {2 Mapping of vertices} *)

src/md.ml

@@ -14,9 +14,6 @@
 (*  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.                  *)
 (*                                                                        *)
 (**************************************************************************)
-
-(* $Id: md.ml,v 1.6 2004-10-22 14:42:06 signoles Exp $ *)
-  
 
 module P(G : Sig.P) = struct
 

src/md.mli

@@ -15,8 +15,6 @@
 (*                                                                        *)
 (**************************************************************************)
 
-(* $Id: md.mli,v 1.2 2004-06-28 13:48:25 signoles Exp $ *)
-
 (** Minimum Degree algorithm
   
     Based on the article: