From 039544007767539ab0807106b8be5f8cac254fa4 Mon Sep 17 00:00:00 2001
From: Erwan Jahier <erwan.jahier@univ-grenoble-alpes.fr>
Date: Thu, 28 Mar 2019 17:50:29 +0100
Subject: [PATCH] New: in rif mode, do not stop at silence
---
lib/sasacore/sasa.ml | 11 ++++-------
1 file changed, 4 insertions(+), 7 deletions(-)
diff --git a/lib/sasacore/sasa.ml b/lib/sasacore/sasa.ml
index 30de69e2..15fab72c 100644
--- a/lib/sasacore/sasa.ml
+++ b/lib/sasacore/sasa.ml
@@ -1,4 +1,4 @@
-(* Time-stamp: <modified the 28/03/2019 (at 16:24) by Erwan Jahier> *)
+(* Time-stamp: <modified the 28/03/2019 (at 17:41) by Erwan Jahier> *)
open Algo
open Sasacore
@@ -81,6 +81,7 @@ let (print_step : int -> int -> SasArg.t -> Env.t -> Process.t list -> string ->
Printf.printf "%s #outs " activate_val; flush stdout
);
Printf.printf "%s %s\n" (StringOf.env_rif e pl) enable_val;
+ flush stderr;
flush stdout
)
else (
@@ -117,13 +118,9 @@ let (simustep: int -> int -> SasArg.t -> Process.t list -> string ->
let enable_val =
String.concat " " (List.map (fun b -> if b then "t" else "f")
(List.flatten enab_ll))
- in
- if (List.flatten all = []) then (
+ in
+ if not (args.rif) && List.for_all (fun b -> not b) (List.flatten enab_ll) then (
print_step n i args e pl activate_val enable_val;
- if args.rif then (
- Printf.eprintf "\n# Sasa is silent; no more processes can be enabled\n";
- Printf.printf "\nq\n";
- flush stderr; flush stdout);
raise (Silent (n-i+1))
);
print_step n i args e pl activate_val enable_val;
--
GitLab