Commits

bergsoe  committed feaae40

The simple brute force EST implementations are renamed to UnbiasedEST.

  • Participants
  • Parent commits c960834

Comments (0)

Files changed (3)

File src/PaplSBL.ml

   val get_ec : value_t -> PaplIncrConstraint.t ref
 end
 
-let ec_dummy = PaplIncrConstraint.fixed_reject
+let ec_dummy = PaplIncrConstraint.fixed_accept
 
 module MakeDefaultHelper
   (T : SETUP)
 
 module EST = struct
   type 'a expand_sampler_t = 'a -> 'a PaplSampler.t
+  type 'a expand_t = 'a -> 'a option
 
   let to_expand constr expansions = ();
     fun q ->
     include SETUP
     module Index : PaplTreeIndex.S_EST_DLT
       with type q_t = value_t
-    val expand : q_t -> q_t option
+    val expand : q_t expand_t
   end
 
   module MakeDefault(M : SETUP) = struct
 
 module RRT = struct
   type 'a expand_sampler_t = 'a -> 'a -> 'a PaplSampler.t
+  type 'a expand_t = 'a -> 'a -> 'a option
 
   let to_expand constr expansions = ();
     fun qa qb ->
     module Index : PaplTreeIndex.S_RRT_DLT
       with type q_t = value_t
     val sampler : q_t option PaplSampler.t
-    val expand : q_t -> q_t -> q_t option
+    val expand : q_t expand_t
   end
 
   module MakeDefault(M : SETUP) = struct
     let get_ec = get_ec
   end
 
-  module EST = struct
+  module UnbiasedEST = struct
     module type SETUP = sig
       include SETUP
-      include PaplTreeIndex.BruteForce.EST.SETUP with type q_t := q_t
+      include PaplTreeIndex.BruteForce.UnbiasedEST.SETUP with type q_t := q_t
 
-      val expand : q_t -> q_t option
+      val expand : q_t EST.expand_t
     end
 
     module MakeSBLSetup (S : SETUP) = struct
         let connect_constr = lift_constr S.connect_constr
         let get_mark = get_mark
       end
-      module Index = PaplTreeIndex.BruteForce.EST.MakeDLT(LiftIndexSetup)
+      module Index = PaplTreeIndex.BruteForce.UnbiasedEST.MakeDLT
+        (LiftIndexSetup)
 
       let expand = S.expand
     end
       include PaplTreeIndex.BruteForce.RRT.SETUP with type q_t := q_t
 
       val sampler : q_t option PaplSampler.t
-      val expand : q_t -> q_t -> q_t option
+      val expand : q_t RRT.expand_t
     end
 
     module MakeSBLSetup (S : SETUP) = struct

File src/PaplSBL.mli

 
 module EST : sig
   type 'a expand_sampler_t = 'a -> 'a PaplSampler.t
+  type 'a expand_t = 'a -> 'a option
 
   val to_expand :
     'a PaplConstraint.t ->
     'a expand_sampler_t ->
-    ('a -> 'a option)
+    'a expand_t
 
   module type SETUP = sig
     include SETUP
     module Index : PaplTreeIndex.S_EST_DLT with type q_t = value_t
 
-    val expand : q_t -> q_t option
+    val expand : q_t expand_t
   end
 
   module MakePointBidir
 
 module RRT : sig
   type 'a expand_sampler_t = 'a -> 'a -> 'a PaplSampler.t
+  type 'a expand_t = 'a -> 'a -> 'a option
 
   val to_expand :
     'a PaplConstraint.t ->
     'a expand_sampler_t ->
-    ('a -> 'a -> 'a option)
+    'a expand_t
 
   module type SETUP = sig
     include SETUP
     module Index : PaplTreeIndex.S_RRT_DLT with type q_t = value_t
 
     val sampler : q_t option PaplSampler.t
-    val expand : q_t -> q_t -> q_t option
+    val expand : q_t expand_t
   end
 
   module MakePointBidir
     val make_constr : q_t * q_t -> PaplIncrConstraint.t
   end
 
-  module EST : sig
+  module UnbiasedEST : sig
     module type SETUP = sig
       include SETUP
-      include PaplTreeIndex.BruteForce.EST.SETUP with type q_t := q_t
+      include PaplTreeIndex.BruteForce.UnbiasedEST.SETUP with type q_t := q_t
 
-      val expand : q_t -> q_t option
+      val expand : q_t EST.expand_t
     end
 
     module MakePointBidir
       include PaplTreeIndex.BruteForce.RRT.SETUP with type q_t := q_t
 
       val sampler : q_t option PaplSampler.t
-      val expand : q_t -> q_t -> q_t option
+      val expand : q_t RRT.expand_t
     end
 
     module MakePointBidir

File src/PaplTreeIndex.ml

       Tree.detach tree
   end
 
-  module EST = struct
+  module UnbiasedEST = struct
     module type SETUP = SETUP
     module type SETUP_DLT = SETUP_DLT