Make gen_data.sh shuffle patient data and use it for therapists

.gitignore

@@ -1,2 +1,3 @@
 /ansible/inventory
 /ansible/.vagrant/
+/src/out-p?.txt

src/gale_shapley.mpc

@@ -105,7 +105,7 @@ class Matchmaker:
 
 # Constants
 PLAYERS = 3
-MATCHING_SIZE = 5
+MATCHING_SIZE = 10
 
 p_shares = Matrix(rows=PLAYERS, columns=MATCHING_SIZE, value_type=types.sint)
 t_shares = Matrix(rows=PLAYERS, columns=MATCHING_SIZE, value_type=types.sint)
@@ -120,7 +120,7 @@ def _(i):
     @do_while
     def _():
         try:
-            typ = sint.get_input_from(i)
+            typ = cint.get_input_from(i)
 
             @if_e(typ == -100)
             def _():

src/gen_data.sh

@@ -15,31 +15,27 @@ secret_share() {
     share_2="$(( secret - (share_0 + share_1) ))"
 }
 
-declare -a p_data_0
-declare -a p_data_1
-declare -a p_data_2
-declare -a t_data_0
-declare -a t_data_1
-declare -a t_data_2
-
 max_index=5
+iter="$1"
 
-for _ in $(seq "$1"); do
+for _ in $(seq "$iter"); do
     rand="$(( (RANDOM % max_index) + 1 ))"
     secret_share "$rand"
 
-    p_data_0+=("$(patient_pref $share_0)")
+    p_data_s+=( "$rand" )
-    p_data_1+=("$(patient_pref $share_1)")
+    p_data_0+=( "$(patient_pref $share_0)" )
-    p_data_2+=("$(patient_pref $share_2)")
+    p_data_1+=( "$(patient_pref $share_1)" )
+    p_data_2+=( "$(patient_pref $share_2)" )
 done
 
-for _ in $(seq "$1"); do
+t_data_s=( $(shuf -e "${p_data_s[@]}") )
-    rand="$(( (RANDOM % max_index) + 1 ))"
-    secret_share "$rand"
 
-    t_data_0+=("$(therapist_pref $share_0)")
+for i in $(seq 0 "$(( iter - 1 ))"); do
-    t_data_1+=("$(therapist_pref $share_1)")
+    secret_share "${t_data_s[$i]}"
-    t_data_2+=("$(therapist_pref $share_2)")
+
+    t_data_0+=( "$(therapist_pref $share_0)" )
+    t_data_1+=( "$(therapist_pref $share_1)" )
+    t_data_2+=( "$(therapist_pref $share_2)" )
 done
 
 for i in $(seq 0 2); do

src/run.sh

@@ -1,6 +1,7 @@
-#!/usr/bin/env sh
+#!/usr/bin/env bash
 
-MACHINE="$1"
-shift
 cd MP-SPDZ
-"./$MACHINE" "$@"
+
+for i in $(seq 0 2); do
+    eval ".//semi-party.x -N 3 -p $i gale_shapley > ../out-p$i.txt 2>&1 &"
+done