Fix some merge bug (I think) and ad coloring implementation with neigh type

src/dot2lus.ml

@@ -49,7 +49,6 @@ let output_prelude lustre_topology lustre_const (graph : Topology.t) =
  Printf.fprintf lustre_const "const mean_degree = %f;\n" (Topology.get_mean_degree graph);
  Printf.fprintf lustre_const "const diameter = %d;\n" (Diameter.get graph);
  Printf.fprintf lustre_const "const is_directed = %b;\n" graph.directed;
- Printf.fprintf lustre_const "const diameter= %d;\n" (Diameter.get graph);
  Printf.fprintf lustre_const "const is_cyclic = %b;\n" (Topology.is_cyclic graph);
  Printf.fprintf lustre_const "const is_connected = %b;\n" (Topology.is_connected graph);
  let neigh_list = graph.nodes |> List.map (fun (n:Topology.node) -> graph.pred n.id) in
@@ -65,7 +64,6 @@ let output_prelude lustre_topology lustre_const (graph : Topology.t) =
   | "mean_degree"
   | "diameter"
   | "is_directed"
-  | "diameter"
   | "is_cyclic"
   | "is_connected"
   | "f"

test/coloring/Makefile

@@ -10,7 +10,7 @@ include ../Makefile.inc
 ##############################################################################
 # Non-regression tests
 
-test: clique3.kind2 clique3.lesar #  clique3.lurette 
+test: clique3.kind2-test clique3.lurette 
 
 clean: genclean
 	rm -f ring*.* er*.* grid*.* clique*.*

test/coloring/dice5.dot

-graph {
-
-	p0 [algo="p.lus"]
-	p1 [algo="p.lus"]
-	p2 [algo="p.lus"]
-	p3 [algo="p.lus"]
-	p4 [algo="p.lus"]
-
-	p1 -- p2 -- p3 -- p4 -- p1
-	p1 -- p0 -- p2
-	p4 -- p0 -- p3
-
-}

test/coloring/p.lus

 include "../../lib/bitset.lus"
 
-type state = int;
+const K = max_degree + 1;
 
-type action = enum { recolor };
-const actions_number = 1;
-
-function action_of_int(i : int) returns (a : action);
-let
-	a = recolor;
-tel;
-
-const K = degree + 1;
-
-function p_enable<<const degree:int>>(this : state; neighbors : state^degree)
+function p_enable<<const degree:int>>(this : state; neighbors : neigh^degree)
 returns (enabled : bool^actions_number);
 	var conflict, out_of_range : bool;
 let
 	out_of_range = this < 0 or this >= K;
-	conflict = subset<<K>>(one_hot<<K>>(this), bitset_of_list<<K,degree>>(neighbors));
+	conflict = subset<<K>>(one_hot<<K>>(this), bitset_of_list<<K,degree>>(map<<state,degree>>(neighbors)));
 	enabled = [ out_of_range or conflict ];
 tel;
 
-function p_step<<const degree:int>>(this : state; neighbors : state^degree; action : action)
+function p_step<<const degree:int>>(this : state; neighbors : neigh^degree; action : action)
 returns (new : state);
 let
-	new = first_set<<K>>(diff<<K>>(true^K, bitset_of_list<<K,degree>>(neighbors)));
+	new = first_set<<K>>(diff<<K>>(true^K, bitset_of_list<<K,degree>>(map<<state,degree>>(neighbors))));
 tel;

test/dijkstra-ring/Makefile

@@ -10,7 +10,7 @@ include ../Makefile.inc
 ##############################################################################
 # Non-regression tests
 
-test: diring4.lurette diring4.kind2
+test: diring3.kind2-test diring4.lurette
 
 clean: genclean
 	rm -f diring*.*

test/unison/unison.lus

 const m0 =  2*diameter -1;
+const k = if m0<2 then 2 else m0;
 
 function min_clock<<const n:int>> (this : int; neighbors : neigh^n)
 returns (new: int);
@@ -12,7 +13,7 @@ tel;
 function newClockValue<<const n:int>> (this : int ; neighbors : neigh^n)
 returns (new: state);
 let
-  new = (min_clock<<n>>(this,neighbors)+1) mod (if m0 < 2 then 2 else m0);
+  new = (min_clock<<n>>(this,neighbors)+1) mod k;
 tel;
 
 function unison_enable<<const degree:int>> (this : state; neighbors : neigh^degree)