ajout du nouvel algo dans le benchmark

bin/bench/dune

@@ -7,6 +7,7 @@
    DissimilarityLib 
    RandomDissimilarity 
    Recognition
+   ChainLib
    core core_unix.command_unix core_bench
  )
 )

bin/bench/robench.ml

@@ -2,7 +2,7 @@ open! Core_bench
 open! CopointLib
 open! RandomDissimilarity
 open! DissimilarityLib
-
+open! ChainLib
 
 let imperative_copoint_algorithm diss =
   diss
@@ -19,6 +19,12 @@ let pivotpair_algorithm diss =
   Recognition.Pivotpair.algo diss (fun i -> i)
   |> ignore
 
+let chain_insertion_algorithm diss = 
+  diss 
+  |> RobinsonByChain.find_compatible_order 
+  |> ignore
+  
+
 
 let toeplitz ~k dim = 
   Toeplitz.toeplitz012 ~n:dim ~k:(min k (dim-2))
@@ -45,7 +51,8 @@ let algorithms =
   [
     Y ("copoint-imp", imperative_copoint_algorithm);
     Y ("copoint-fun", functional_copoint_algorithm);
-    Y ("pivotpair", pivotpair_algorithm)
+    Y ("pivotpair", pivotpair_algorithm);
+    Y ("chain-insertion", chain_insertion_algorithm)
   ]
 
 

bin/dune

 (executable
  (public_name copoint)
  (name main)
- (libraries RobinsonLib CopointLib DissimilarityLib Recognition))
+ (libraries RobinsonLib CopointLib DissimilarityLib Recognition ChainLib))

bin/main.ml

@@ -46,4 +46,5 @@ let _main =
   let _algo1 diss = RobinsonCCNP.find_compatible_order diss in 
   let _algo2 diss = ImperativeCCNP.find_compatible_order diss |> Option.map Array.to_list in 
   let _algo3 diss = Recognition.Pivotpair.algo diss (fun i -> i) in
-  _from_stdin _algo1 
+  let _algo4 diss = ChainLib.RobinsonByChain.find_compatible_order diss in 
+  _from_stdin _algo3

test/propertytest/pqtree.ml

@@ -12,7 +12,7 @@ let frontier_is_a_contained_permutation pqtree =
 
 let test_frontier_is_a_contained_permutation = 
   QCheck2.Test.make
-    ~name:"The frontier of a PQ-tree is a contained in that PQ-tree"
+    ~name:"The frontier of a PQ-tree is contained in that PQ-tree"
     ~print 
     pqtree_gen 
     frontier_is_a_contained_permutation