anneal.ml test/exTspTest.ml test/toolsTest.ml tools.ml @@ -1,8 +1,13 @@ TARGETS=\ - $(patsubst test/%Test.ml,test/%Test.byte,$(wildcard test/*Test.ml)) + $(patsubst test/%Test.ml,test/%Test.byte,$(wildcard test/*Test.ml))\ + $(patsubst ex/%Run.ml,ex/%Run.native,$(wildcard ex/*Run.ml)) -OCAMLBUILD=ocamlbuild -classic-display +OCAMLBUILD=ocamlbuild -classic-display -I ex .PHONY: build build: $(OCAMLBUILD) $(TARGETS) + +.PHONY: clean +clean: + $(OCAMLBUILD) -clean Makefile @@ -28,7 +28,7 @@ let tail seq = Lazy.force q -(* Construction helpers *) +(* Transformation helpers *) let rec of_list lst = match lst with @@ -37,6 +37,16 @@ let rec of_list lst = | [] -> Nil +let to_list seq = + let rec _to_list seq acc = + match head seq with + | Some h -> + _to_list (tail seq) (h::acc) + | None -> + List.rev acc + in + _to_list seq [] + let rec of_serie fn n0 = Cons(n0, lazy (of_serie fn (fn n0))) @@ -78,3 +88,31 @@ let rec filter pred seq = else filter pred (tail seq) +let rec concat seqs = + match seqs with + | h :: a -> + begin + match head h with + | None -> + concat a + | Some e -> + Cons(e, lazy (concat ((tail h) :: a))) + end + | [] -> + Nil + +let rec cart seqs = + match seqs with + | [] -> + Nil + | h :: [] -> + map (fun e -> [e;]) h + | h :: a -> + match head h with + | None -> + Nil + | Some e -> + concat [ + (map (fun c -> e :: c) (cart a)); + (cart ((tail h) :: a)); + ] seq.ml @@ -43,10 +43,11 @@ let _ = Tests.register "Base: head_exn" (fun () -> OUnit.assert_raises Seq.EmptySeq (fun () -> Seq.head_exn s) ) -let _ = Tests.register "Helper: of_list" (fun () -> +let _ = Tests.register "Helper: of_list, to_list" (fun () -> let l = [1;2;3;] in let s = Seq.of_list l in - _cmp_to_list_end s l + _cmp_to_list_end s l; + OUnit.assert_equal l (Seq.to_list s) ) let _ = Tests.register "Helper: of_serie" (fun () -> @@ -91,4 +92,29 @@ let _ = Tests.register "filter" (fun () -> _cmp_to_list_end f [0;2;4;6;8;] ) +let _ = Tests.register "concat" (fun () -> + let s1 = Seq.of_list [0;1;2;] in + let s2 = Seq.of_list [3;4;5;] in + let s3 = Seq.of_list [6;7;8;] in + let seq = Seq.concat [s1;s2;s3;] in + _cmp_to_list_end seq [0;1;2;3;4;5;6;7;8;] +) + +let _ = Tests.register "cart" (fun () -> + let s1 = Seq.of_list [0;1;] in + let s2 = Seq.of_list [2;3;] in + let s3 = Seq.of_list [4;5;] in + let cart = Seq.cart [s1;s2;s3] in + _cmp_to_list_end cart [ + [0;2;4;]; + [0;2;5;]; + [0;3;4;]; + [0;3;5;]; + [1;2;4;]; + [1;2;5;]; + [1;3;4;]; + [1;3;5;]; + ] +) + let _ = Tests.run "Seq test suite" test/seqTest.ml 9ebe1ee4235fff84951d3ddb4ececd199c82e4ac Ludovic Coquelle lcoquelle@gmail.com http://github.com/khigia/ocaml-anneal/commit/f007d93080b1b0253fe3b416c969ded44608b775 f007d93080b1b0253fe3b416c969ded44608b775 2008-06-08T08:54:29-07:00 2008-06-08T08:54:29-07:00 First version of simulated annealing kind of working. 32e787185859965155a1533ca226614c6456a31c Ludovic Coquelle lcoquelle@gmail.com