improve output

src/Arguments.ml

@@ -137,7 +137,7 @@ let spec_short =
       " choose sampler" );
     ("--seed", Set_int random_seed, "seed of the random sampler");
     ("--frequency", Set_float frequency, "frequency parameter s");
-    ( "--time-duration",
+    ( "--expected-duration",
       Set_float expected_duration,
       "time word duration parameter" );
     ("--exact-duration", Bool is_duration_exact, "sample duration exactly");
@@ -177,7 +177,6 @@ let spec_full =
   @ [
       ("--interactive", Bool is_interactive, "Interactive mode");
       ("-i", Bool is_interactive, "Interactive mode");
-      ("--no-cache", Bool no_cache, "disable caching");
       ("--gnuplot-driver", Set_string gnuplot_driver, "launch gnuplot");
       ( "--export-splitreach",
         Set_string export_zone_graph,

test.t/integration.sh

@@ -6,13 +6,13 @@ $WG ../example/nfm19.prism --output-format state_list_full --sampler halton -v 3
 $WG ../example/nfm19.prism --traj 100 --receding 10 --export-splitreach test.json --debug
 $WG ../example/nfm19.prism --frequency 1.0 data.out --gnuplot-driver png --output-format state_list_full
 $WG ../example/nfm19.prism --frequency 1.0 --exact-rational
-$WG ../example/nfm19.prism --time-duration 1.0
-$WG ../example/nfm19.prism --time-duration 1.0 --exact-rational
+$WG ../example/nfm19.prism --expected-duration 1.0
+$WG ../example/nfm19.prism --expected-duration 1.0 --exact-rational
 $WG ../example/test2mod.prism --frequency 1
-$WG ../example/test2mod.prism --time-duration 9 --exact-rational
-$WG ../example/bimodal.prism --time-duration 4.4
+$WG ../example/test2mod.prism --expected-duration 9 --exact-rational
+$WG ../example/bimodal.prism --expected-duration 4.4
 $WG ../example/nfm19.prism --template "@1[b]0.2[0.3]_[_]"
 $WG ../example/nfm19.prism --template "@1[b]0.2[0.3]_[_]" --poly -1
 $WG ../example/nfm19.prism --debug --output-format debug --splitting-debug test.tex
-$WG ../example/nfm19.prism --time-duration 1.0 --debug --splitting-debug test.tex
-$WG ../example/twoears.xml --time-duration 1 
+$WG ../example/nfm19.prism --expected-duration 1.0 --debug --splitting-debug test.tex
+$WG ../example/twoears.xml --expected-duration 1 

test.t/run.t

@@ -9,7 +9,7 @@ Simple interaction
     --sampler {random|halton|kronecker} choose sampler (default:random)
     --seed seed of the random sampler
     --frequency frequency parameter s
-    --time-duration time word duration parameter
+    --expected-duration time word duration parameter
     --exact-duration sample duration exactly
     --boltzmann boltzmann parameter z
     --expected-size time word size parameter
@@ -22,7 +22,6 @@ Simple interaction
     --gnuplot-cmd Command to pass to gnuplot for display
     --interactive Interactive mode
     -i Interactive mode
-    --no-cache disable caching
     --gnuplot-driver launch gnuplot
     --export-splitreach Export the splitted zone graph
     --splitting-debug Export debug information on the splitting in tex format (default:)
@@ -40,7 +39,7 @@ Simple interaction
     --sampler {random|halton|kronecker} choose sampler (default:random)
     --seed seed of the random sampler
     --frequency frequency parameter s
-    --time-duration time word duration parameter
+    --expected-duration time word duration parameter
     --exact-duration sample duration exactly
     --boltzmann boltzmann parameter z
     --expected-size time word size parameter
@@ -53,7 +52,6 @@ Simple interaction
     --gnuplot-cmd Command to pass to gnuplot for display
     --interactive Interactive mode
     -i Interactive mode
-    --no-cache disable caching
     --gnuplot-driver launch gnuplot
     --export-splitreach Export the splitted zone graph
     --splitting-debug Export debug information on the splitting in tex format (default:)
@@ -608,8 +606,8 @@ Test with s<>0
 
 
 
-  $ wordgen nfm19.prism --seed 42 --time-duration 1.0 -v 5 --output-format timestamp | sed 's/[[][0-9]*[.][0-9]*s[]]//g'
-  parameters : wordgen --seed 42 --time-duration 1 --output-format timestamp -v 5
+  $ wordgen nfm19.prism --seed 42 --expected-duration 1.0 -v 5 --output-format timestamp | sed 's/[[][0-9]*[.][0-9]*s[]]//g'
+  parameters : wordgen --seed 42 --expected-duration 1 --output-format timestamp -v 5
   Precomputation file found but file have change discard !
   Reading Prism automaton file. 
   Computing forward reachability graph ... 7 states found. 
@@ -642,7 +640,7 @@ Test with s<>0
   0.227281	0.085605	0.059326	
   0.413225	0.532321	0.405257	
 
-  $ wordgen nfm19.prism --seed 42 --time-duration 1.0 --exact-rational --output-format time_and_label | sed 's/[[][0-9]*[.][0-9]*s[]]//g'
+  $ wordgen nfm19.prism --seed 42 --expected-duration 1.0 --exact-rational --output-format time_and_label | sed 's/[[][0-9]*[.][0-9]*s[]]//g'
   Precomputation file found but file have change discard !
   Reading Prism automaton file. 
   Computing forward reachability graph ... 7 states found. 
@@ -850,7 +848,7 @@ Test Template
   Reading Prism automaton file. 
   Computing forward reachability graph ... 7 states found. 
   Computing Distribution[floating point; Poly; no s; clocks:{x4; x3; x2; x1; x; }; vars:{t; z; s; }] -> -1: [] 
-  Volume in initial state:0, degree of liberty:0
+  Volume in initial state:0, degree of liberty:-1
   Saving Precomputation 
   id:0 m.UID  m.s:0 x4:0.000000  x3:0.000000  x2:0.000000  x1:0.000000  x:0.000000  
     [b]-[0;2]
@@ -901,7 +899,7 @@ Test Monitor
 
 Test time duration
 
-  $ wordgen test2mod.prism --time-duration 9 --exact-rational --seed 42 --output-format state_list_delay | sed 's/[[][0-9]*[.][0-9]*s[]]//g'
+  $ wordgen test2mod.prism --expected-duration 9 --exact-rational --seed 42 --output-format state_list_delay | sed 's/[[][0-9]*[.][0-9]*s[]]//g'
   Precomputation file found but file have change discard !
   Reading Prism automaton file. 
   Computing forward reachability graph ... 13 states found. 
@@ -1013,7 +1011,7 @@ Test time duration
 
 
 
-  $ wordgen bimodal.prism --time-duration 4.4 --seed 42 | sed 's/[[][0-9]*[.][0-9]*s[]]//g'
+  $ wordgen bimodal.prism --expected-duration 4.4 --seed 42 | sed 's/[[][0-9]*[.][0-9]*s[]]//g'
   Reading Prism automaton file. 
   Computing forward reachability graph ... 3 states found. 
   Splitting reachability graph ... 3 states and 4 DBMs found. 
@@ -1108,7 +1106,7 @@ Test Low discrepancy sequence
 
 
 
-  $ wordgen twoears.prism --seed 42 --time-duration 1.5 --exact-rational --traj 1 --poly 5 --output-format debug | sed 's/[[][0-9]*[.][0-9]*s[]]//g'
+  $ wordgen twoears.prism --seed 42 --expected-duration 1.5 --exact-rational --traj 1 --poly 5 --output-format debug | sed 's/[[][0-9]*[.][0-9]*s[]]//g'
   Precomputation file found but file have change discard !
   Reading Prism automaton file. 
   Computing forward reachability graph ... 3 states found. 

web-view/res/index.html

@@ -61,11 +61,11 @@
       
         <li><a href="?automata=GEXNAgzhMksUlTMY29udGVudA==SEMQ==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BtlTIZmluYWw=BtNAg76UksUlTMY29udGVudA==SEMg==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BtAABlTIbGFiZWw=SEYQ==lTIZ3VhcmQ=SMKHggPCAxKQ==lTIcmVzZXQ=SEe3l9lTIYmVuZA==SENDAuABAlTIbGFiZWw=SEYg==lTIZ3VhcmQ=ScKCh4IDwgMSkgJiAoeSA8IDEpKQ==lTIcmVzZXQ=SIe3gseX0=lTIYmVuZA==SENDAuDlTMY2xvY2sgMA==SEeA==lTMY2xvY2sgMQ==SEeQ==&cmd=wordgen%20--poly%20-1%20--traj%2051%20--receding%2020%20--output-format%20state_list_full%20automata.prism">Simple triangle</a></li>
 
-        <li><a href="?automata=GEXNAk8IjtMlTMY29udGVudA==SEMQ==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BtlTIZmluYWw=BfNAgzxAAlTMY29udGVudA==SEMg==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BtNAgzxAl7QlTMY29udGVudA==SEMw==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BtAABlTIbGFiZWw=SEYQ==lTIZ3VhcmQ=SMKHggPCAxKQ==lTIcmVzZXQ=SEe3h9lTIYmVuZA==SEMC4=AAClTIbGFiZWw=SEYg==lTIZ3VhcmQ=SMKHggPiAxKQ==lTIcmVzZXQ=SEe3h9lTIYmVuZA==SEMC4=ABBlTIbGFiZWw=SEYQ==lTIZ3VhcmQ=SMKHggPCAxKQ==lTIcmVzZXQ=SEe3h9lTIYmVuZA==SILTMwLg==ACClTIbGFiZWw=SEYg==lTIZ3VhcmQ=SMKHggPiAxKQ==lTIcmVzZXQ=SEe3h9lTIYmVuZA==SEMzAuDlTMY2xvY2sgMA==SEeA==&cmd=wordgen%20--poly%205%20--traj%202000%20--time-duration%2011%20--output-format%20void%20--apericube%20automata.prism">Bimodal</a></li>
+        <li><a href="?automata=GEXNAk8IjtMlTMY29udGVudA==SEMQ==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BtlTIZmluYWw=BfNAgzxAAlTMY29udGVudA==SEMg==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BtNAgzxAl7QlTMY29udGVudA==SEMw==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BtAABlTIbGFiZWw=SEYQ==lTIZ3VhcmQ=SMKHggPCAxKQ==lTIcmVzZXQ=SEe3h9lTIYmVuZA==SEMC4=AAClTIbGFiZWw=SEYg==lTIZ3VhcmQ=SMKHggPiAxKQ==lTIcmVzZXQ=SEe3h9lTIYmVuZA==SEMC4=ABBlTIbGFiZWw=SEYQ==lTIZ3VhcmQ=SMKHggPCAxKQ==lTIcmVzZXQ=SEe3h9lTIYmVuZA==SILTMwLg==ACClTIbGFiZWw=SEYg==lTIZ3VhcmQ=SMKHggPiAxKQ==lTIcmVzZXQ=SEe3h9lTIYmVuZA==SEMzAuDlTMY2xvY2sgMA==SEeA==&cmd=wordgen%20--poly%205%20--traj%202000%20--expected-duration%2011%20--output-format%20void%20--apericube%20automata.prism">Bimodal</a></li>
 
         <li><a href="?automata=GEXNAxucopUlTMY29udGVudA==SEMQ==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BtlTIZmluYWw=BfNAopUopUlTMY29udGVudA==SEMg==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BfNAgyiEopUlTMY29udGVudA==SEMw==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BfNAg76UopUlTMY29udGVudA==SENA==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BfNAhj0Ui9YlTMY29udGVudA==SENQ==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BfNAhruUopUlTMY29udGVudA==SENg==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BfNAhj0Ut1QlTMY29udGVudA==SENw==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BfAABlTIbGFiZWw=SEYg==lTIZ3VhcmQ=SMKHggPCA0KQ==lTIcmVzZXQ=SIe3gseDF9lTIYmVuZA==SEMC4=ABClTIbGFiZWw=SEYw==lTIZ3VhcmQ=SMKHggPCA0KQ==lTIcmVzZXQ=SIe3gseDJ9lTIYmVuZA==SEMC4=ACDlTIbGFiZWw=SEZA==lTIZ3VhcmQ=SMKHggPCA0KQ==lTIcmVzZXQ=SIe3gseDN9lTIYmVuZA==SEMC4=ADElTIbGFiZWw=SEYQ==lTIZ3VhcmQ=ShQKCgoeDQgPiA4KSAmICh4NCA8IDEyKSkgJiAoeCA8IDQpKQ==lTIcmVzZXQ=SIe3gseDR9lTIYmVuZA==SENDAuAEFlTIbGFiZWw=SEYg==lTIZ3VhcmQ=ShQKCgoeDEgPiA4KSAmICh4MSA8IDEyKSkgJiAoeCA8IDQpKQ==lTIcmVzZXQ=SIe3gseDF9lTIYmVuZA==SENDAuAFGlTIbGFiZWw=SEYw==lTIZ3VhcmQ=ShQKCgoeDIgPiA4KSAmICh4MiA8IDEyKSkgJiAoeCA8IDQpKQ==lTIcmVzZXQ=SIe3gseDJ9lTIYmVuZA==SENDAuAGDlTIbGFiZWw=SEZA==lTIZ3VhcmQ=ShQKCgoeDMgPiA4KSAmICh4MyA8IDEyKSkgJiAoeCA8IDQpKQ==lTIcmVzZXQ=SIe3gseDN9lTIYmVuZA==SENDAuDlTMY2xvY2sgMA==SEeA==lTMY2xvY2sgMQ==SEeDE=lTMY2xvY2sgMg==SEeDI=lTMY2xvY2sgMw==SEeDM=lTMY2xvY2sgNA==SEeDQ=&cmd=wordgen%20--poly%205%20--traj%201%20--receding%2030%20--output-format%20time_and_label%20automata.prism">quasi-periodic-4</a></li>
       
-        <li><a href="?automata=GEXNAxucopUlTMY29udGVudA==SEMQ==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BtlTIZmluYWw=BfNAopUopUlTMY29udGVudA==SEMg==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BfNAgyiEopUlTMY29udGVudA==SEMw==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BfNAg76UopUlTMY29udGVudA==SENA==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BfNAhj0Ui9YlTMY29udGVudA==SENQ==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BfNAhruUopUlTMY29udGVudA==SENg==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BfNAhj0Ut1QlTMY29udGVudA==SENw==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BfAABlTIbGFiZWw=SEYg==lTIZ3VhcmQ=SIdHJ1ZQ==lTIcmVzZXQ=SIe3gxfQ==lTIYmVuZA==SEMC4=ABClTIbGFiZWw=SEYw==lTIZ3VhcmQ=SIdHJ1ZQ==lTIcmVzZXQ=SIe3gyfQ==lTIYmVuZA==SEMC4=ACDlTIbGFiZWw=SEZA==lTIZ3VhcmQ=SIdHJ1ZQ==lTIcmVzZXQ=SIe3gzfQ==lTIYmVuZA==SEMC4=ADElTIbGFiZWw=SEYQ==lTIZ3VhcmQ=SMKHg0ID4gOCk=lTIcmVzZXQ=SIe3g0fQ==lTIYmVuZA==SENDAuAEFlTIbGFiZWw=SEYg==lTIZ3VhcmQ=SMKHgxID4gOCk=lTIcmVzZXQ=SIe3gxfQ==lTIYmVuZA==SENDAuAFGlTIbGFiZWw=SEYw==lTIZ3VhcmQ=SMKHgyID4gOCk=lTIcmVzZXQ=SIe3gyfQ==lTIYmVuZA==SENDAuAGDlTIbGFiZWw=SEZA==lTIZ3VhcmQ=SMKHgzID4gOCk=lTIcmVzZXQ=SIe3gzfQ==lTIYmVuZA==SENDAuDlTMY2xvY2sgMA==SEeDE=lTMY2xvY2sgMQ==SEeDI=lTMY2xvY2sgMg==SEeDM=lTMY2xvY2sgMw==SEeDQ=&cmd=wordgen%20--poly%205%20--traj%20300%20--receding%2010%20--time-duration%2030%20--output-format%20void%20--apericube%20automata.prism">quasi-periodic-4-unconstrain</a></li>
+        <li><a href="?automata=GEXNAxucopUlTMY29udGVudA==SEMQ==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BtlTIZmluYWw=BfNAopUopUlTMY29udGVudA==SEMg==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BfNAgyiEopUlTMY29udGVudA==SEMw==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BfNAg76UopUlTMY29udGVudA==SENA==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BfNAhj0Ui9YlTMY29udGVudA==SENQ==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BfNAhruUopUlTMY29udGVudA==SENg==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BfNAhj0Ut1QlTMY29udGVudA==SENw==lTMaW52YXJpYW50SIdHJ1ZQ==lTMaW5pdGlhbA==BflTIZmluYWw=BfAABlTIbGFiZWw=SEYg==lTIZ3VhcmQ=SIdHJ1ZQ==lTIcmVzZXQ=SIe3gxfQ==lTIYmVuZA==SEMC4=ABClTIbGFiZWw=SEYw==lTIZ3VhcmQ=SIdHJ1ZQ==lTIcmVzZXQ=SIe3gyfQ==lTIYmVuZA==SEMC4=ACDlTIbGFiZWw=SEZA==lTIZ3VhcmQ=SIdHJ1ZQ==lTIcmVzZXQ=SIe3gzfQ==lTIYmVuZA==SEMC4=ADElTIbGFiZWw=SEYQ==lTIZ3VhcmQ=SMKHg0ID4gOCk=lTIcmVzZXQ=SIe3g0fQ==lTIYmVuZA==SENDAuAEFlTIbGFiZWw=SEYg==lTIZ3VhcmQ=SMKHgxID4gOCk=lTIcmVzZXQ=SIe3gxfQ==lTIYmVuZA==SENDAuAFGlTIbGFiZWw=SEYw==lTIZ3VhcmQ=SMKHgyID4gOCk=lTIcmVzZXQ=SIe3gyfQ==lTIYmVuZA==SENDAuAGDlTIbGFiZWw=SEZA==lTIZ3VhcmQ=SMKHgzID4gOCk=lTIcmVzZXQ=SIe3gzfQ==lTIYmVuZA==SENDAuDlTMY2xvY2sgMA==SEeDE=lTMY2xvY2sgMQ==SEeDI=lTMY2xvY2sgMg==SEeDM=lTMY2xvY2sgMw==SEeDQ=&cmd=wordgen%20--poly%205%20--traj%20300%20--receding%2010%20--expected-duration%2030%20--output-format%20void%20--apericube%20automata.prism">quasi-periodic-4-unconstrain</a></li>