added all experiments code and neatened definitions

Author: kiranandcode

data/plt1_0inst_is.dat

@@ -1,20 +1,19 @@
 [@@@ocaml "-33"]
 open Core
 (* open Generalized_gpw *)
-open Majority_gpw
 (* open Gpw *)
 open Utils
 open Gnuplot
 
 module Spec : Majority_alg.SPEC = struct
 
-  let constant_Maj_B = 30
+  let constant_Maj_B = 10
 
-  let constant_2D_A = 5
+  let constant_2D_A = 10
 
 end
 
-module MajoritySampler = Majority_alg.MajoritySamplingAlgorithm (Spec) (MajorityGPW)
+module MajoritySampler = Majority_alg.MajoritySamplingAlgorithm (Spec) (Majority_gpw.MajorityGPW)
 
 
 let plot_output x =
@@ -32,9 +31,9 @@ let print_output ~f ~filename data =
 
 
 
-let () =
+let generate_input_tests () =
   i_to_j 4 100 |> List.map ~f:(fun size ->
-      let instance = MajorityGPW.generate_true_instance size in
+      let instance = Majority_gpw.MajorityGPW.generate_true_instance size in
       let count = 10 in
       Float.of_int size, i_to_j 0 count |> List.map ~f:(fun _ ->
           let (result, _) = MajoritySampler.evaluate instance in
@@ -48,7 +47,7 @@ let () =
     ~filename:"data/plt1_1inst_is.dat";
 
   i_to_j 4 100 |> List.map ~f:(fun size ->
-      let instance = MajorityGPW.generate_false_instance size in
+      let instance = Majority_gpw.MajorityGPW.generate_false_instance size in
       let count = 10 in
       Float.of_int size, i_to_j 0 count |> List.map ~f:(fun _ ->
           let (result, _) = MajoritySampler.evaluate instance in
@@ -61,11 +60,121 @@ let () =
     ~f:(fun (a,b) -> Printf.sprintf "%2f %2f" a b)
     ~filename:"data/plt1_0inst_is.dat"
 
+let generate_experiment_1 () =
+  let size = 20 in
+  let samples = 100 in
+  i_to_j 0 10
+  |> List.map ~f:(fun valid_count ->
+      let instance =
+        Majority_gpw.MajorityGPW.generate_false_instance
+          ~options:(Majority_gpw.MajorityGPW.FixedValidCount valid_count) size in
+      i_to_j 0 samples
+      |> List.map ~f:begin fun _ ->
+        fst (MajoritySampler.evaluate instance)
+      end
+      |> List.map ~f:(fun v ->  if v then 1 else 0)
+      |> List.fold ~init:0 ~f:(+)
+      |> fun v -> valid_count, Float.(of_int v / of_int samples)
+    )
+  |> print_output
+    ~f:(fun (valid_count,v) -> Printf.sprintf "%d %f" valid_count v )
+    ~filename:"../data/experiment1.dat"
+
+let generate_experiment_2 () =
+  let samples = 100 in
+  i_to_j 4 21
+  |> List.map ~f:(fun input_size ->
+      let instance =
+        Majority_gpw.MajorityGPW.generate_true_instance input_size in
+      i_to_j 0 samples
+      |> List.map ~f:begin fun _ ->
+        snd (MajoritySampler.evaluate instance)
+      end
+      |> List.fold ~init:0 ~f:(+)
+      |> fun v -> input_size, Float.(of_int v / of_int samples)
+    )
+  |> print_output
+    ~f:(fun (valid_count,v) -> Printf.sprintf "%d %f" valid_count v )
+    ~filename:"../data/experiment2a.dat";
+  i_to_j 4 21
+  |> List.map ~f:(fun input_size ->
+      let instance =
+        Majority_gpw.MajorityGPW.generate_false_instance input_size in
+      i_to_j 0 samples
+      |> List.map ~f:begin fun _ ->
+        snd (MajoritySampler.evaluate instance)
+      end
+      |> List.fold ~init:0 ~f:(+)
+      |> fun v -> input_size, Float.(of_int v / of_int samples)
+    )
+  |> print_output
+    ~f:(fun (valid_count,v) -> Printf.sprintf "%d %f" valid_count v )
+    ~filename:"../data/experiment2b.dat"
+
+
+let generate_experiment_3 () =
+  let samples = 100 in
+  i_to_j 4 31
+  |> List.map ~f:(fun input_size ->
+      i_to_j 0 samples
+      |> List.concat_map ~f:begin fun _ ->
+         let instance = Majority_gpw.MajorityGPW.generate_true_instance input_size in
+         i_to_j 0 10
+          |> List.map ~f:(fun _ -> snd (MajoritySampler.evaluate instance))
+      end
+      |> List.fold ~init:0 ~f:(+)
+      |> fun v -> input_size, Float.(of_int v / of_int samples)
+    )
+  |> print_output
+    ~f:(fun (valid_count,v) -> Printf.sprintf "%d %f" valid_count v )
+    ~filename:"../data/experiment3a.dat";
+  i_to_j 4 31
+  |> List.map ~f:(fun input_size ->
+      i_to_j 0 samples
+      |> List.concat_map ~f:begin fun _ ->
+        let instance = Majority_gpw.MajorityGPW.generate_true_instance
+                         ~options:(Majority_gpw.MajorityGPW.RandomPointers) input_size in
+         i_to_j 0 10
+          |> List.map ~f:(fun _ -> snd (MajoritySampler.evaluate instance))
+      end
+      |> List.fold ~init:0 ~f:(+)
+      |> fun v -> input_size, Float.(of_int v / of_int samples)
+    )
+  |> print_output
+    ~f:(fun (valid_count,v) -> Printf.sprintf "%d %f" valid_count v )
+    ~filename:"../data/experiment3b.dat";
+  i_to_j 4 31
+  |> List.map ~f:(fun input_size ->
+      i_to_j 0 samples
+      |> List.concat_map ~f:begin fun _ ->
+        let instance = Majority_gpw.MajorityGPW.generate_false_instance
+                         ~options:(Majority_gpw.MajorityGPW.RandomPointers) input_size in
+         i_to_j 0 10
+          |> List.map ~f:(fun _ -> snd (MajoritySampler.evaluate instance))
+      end
+      |> List.fold ~init:0 ~f:(+)
+      |> fun v -> input_size, Float.(of_int v / of_int samples)
+    )
+  |> print_output
+    ~f:(fun (valid_count,v) -> Printf.sprintf "%d %f" valid_count v )
+    ~filename:"../data/experiment3c.dat";
+  i_to_j 4 31
+  |> List.map ~f:(fun input_size ->
+      i_to_j 0 samples
+      |> List.concat_map ~f:begin fun _ ->
+        let instance = Majority_gpw.MajorityGPW.generate_false_instance
+                         ~options:(Majority_gpw.MajorityGPW.RandomPointers) input_size in
+         i_to_j 0 10
+          |> List.map ~f:(fun _ -> snd (MajoritySampler.evaluate instance))
+      end
+      |> List.fold ~init:0 ~f:(+)
+      |> fun v -> input_size, Float.(of_int v / of_int samples)
+    )
+  |> print_output
+    ~f:(fun (valid_count,v) -> Printf.sprintf "%d %f" valid_count v )
+    ~filename:"../data/experiment3d.dat"
 
-
-  (* List.iter ~f:(fun (size,no_false_positives) ->
-   *     Printf.printf "%3d: %3f\n" size no_false_positives
-   *   ) *)
-
-
-
+let () =
+  generate_experiment_1 ();
+  generate_experiment_2 ();
+  generate_experiment_3 ()

main.ml

@@ -43,7 +43,7 @@ module MajoritySamplingAlgorithm (Spec: SPEC) (Function: FUNCTION with type p =
     let threshhold =
       let open Float in
       let no_samples = of_int no_samples in
-      to_int (no_samples / 2.0  - sqrt (no_samples)) in
+      to_int (no_samples / 2.0  - sqrt (no_samples)) |> fun x -> Int.(x + 1)  in
     let count = ref 0 in
     (* muks et al's algorithm for sampling *)
     let validate_plane instance =
@@ -138,6 +138,6 @@ module MajoritySamplingAlgorithm (Spec: SPEC) (Function: FUNCTION with type p =
       end
     done;
     (* if fewer than this threshold of 1-instances then 0-instance (1/3 prob of incorrect)  *)
-    (if !count <= threshhold then false else true), !query_count
+    (if !count < threshhold then false else true), !query_count
 
 end

majority_alg.ml

@@ -6,7 +6,7 @@ module MajorityGPW = struct
 
   type p = int
 
-  type o = FakePointers | RandomPointers
+  type o = FakePointers | RandomPointers | FixedValidCount of int | RandomValidCount
 
   let get_params (_, n) = n
 
@@ -147,8 +147,12 @@ module MajorityGPW = struct
       done;
     done;
     let set = ref (Set.empty (module Int)) in
-    let bound = (n / 2 - 1 ) in
-    while Set.length !set <= bound do
+    let bound = match _options with
+      | Some RandomValidCount -> Random.int (n / 2 - 1)
+      | Some (FixedValidCount n) -> n
+      | _ -> (n / 2 - 1)
+    in
+    while Set.length !set < bound do
       let index = Random.int n in
       set := (Set.add !set index)
     done;