Commit 96e44f29 authored by Sébastien Gamblin's avatar Sébastien Gamblin
Browse files

Some calculation optimizations

parent 1740aef8

hanabi_launcher.py

+1 −0
Changes for hanabi_launcher.py: 1 added line, 0 removed lines.
Original line number Diff line number Diff line
@@ -152,6 +152,7 @@ def model_checking(ex, logtime): 
            logtime[fname] = (f"Previous timeout of {args.modelcheck}s", f"Previous timeout of {args.modelcheck}s")



    logtime["total time MC"] = time.time() - time_f

    if type(ex.getEpistemicModel()).__name__ == "ProbaStructure":

        logtime["Precompile PiTheta"] = ex.getEpistemicModel().compute_pi_theta_prime_time

        logtime["Precompile Marg(PiTheta)"] = ex.getEpistemicModel().compute_pi_theta_prime_marginalized_time

hanabi_loop.py

+1 −1
Changes for hanabi_loop.py: 1 added line, 1 removed line.
Original line number Diff line number Diff line
@@ -71,7 +71,7 @@ if __name__ == '__main__': 


    for nb_cards in range(args.begin, args.end, args.step):

        #print("asserts", args.asserts)

        string = f"python3 {'-O' if args.asserts else ''} scripts/hanabi_launcher.py {nb_cards}" \

        string = f"python3 {'-O' if args.asserts else ''} hanabi_launcher.py {nb_cards}" \

                 f" -a {args.agents} " \

                 f" -ch {args.chands} " \

                 f" -t {args.type}" \

launch_xp.sh

+6 −3
Changes for launch_xp.sh: 6 added lines, 3 removed lines.
Original line number Diff line number Diff line
@@ -49,14 +49,17 @@ run_process_loop () { 
    echo $filename



    # shellcheck disable=SC2086

    if true; then

    #if true; then

      /usr/bin/time -f "; %C; time; %es; memory; %MKB; cpu; %P;ch;${Cards_in_hand};end;${end}" -o "$filename"_time.txt \

        python3 hanabi_loop.py \

        -O -b "$begin" -e "$end" -step "$Nb_steps" -a "$agent" -ch "$Cards_in_hand" -xc "$Timeout" -lr 5 $Symbolic_flag -mc "$TimeoutMCPU" -pu "$TimeoutMCPU" $proba $Norm_flag \

          >"$filename".txt &

          >"$filename".txt

          exit

    #  exit

    #  /usr/bin/time -f "; %C; time; %es; memory; %MKB; cpu; %P;ch;${Cards_in_hand};end;${end}" -o "$filename"_time.txt python3 hanabi_loop.py -O -b 8 -e 11 -step 2 -a 2 -ch 2 -xc 100 -lr 5 -s -mc 50 -pu 50 $proba  > filename.txt

       ##REMOVE THE & HERE ^  TO RUN EVERYTHING SEQUENTIALLY (useful to reproduce the experiments on a standard desktop machine)

      begin="$end"

    fi

    #fi



  done

}