Optimized Promela generation

4 files changed, 15 insertions, 96 deletions

diff --git a/test/w3c/analyze_promela_tests.pl b/test/w3c/analyze_tests.pl
index 5e1b96b..edc53da 100755
--- a/test/w3c/analyze_promela_tests.pl
+++ b/test/w3c/analyze_tests.pl
@@ -72,14 +72,29 @@ while ($block = <FILE>) {
 		next;
 	}
 	
+	# Test Duration ========
+	if ($block =~ 
+		/
+			\<end\sof\soutput\>\n
+			Test\stime\s\=\s+([\d\.]+)\s(\w+)
+		/x ) {
+		$test->{$currTest}->{'duration'} = $1;
+		$test->{$currTest}->{'durationUnit'} = $2;
+		# next; - no next as this is part of the actual test output we need to scan below
+	}
+	
 	# Promela Test ========
 	if ($block =~ 
 		/
 			Approximate\sComplexity:\s(\d+)\n
 			Actual\sComplexity:\s(\d+)\n
+			Internal\sQueue:\s(\d+)\n
+			External\sQueue:\s(\d+)\n
 		/x ) {
 		$test->{$currTest}->{'flat'}->{'apprComplexity'} = $1;
 		$test->{$currTest}->{'flat'}->{'actualComplexity'} = $2;
+		$test->{$currTest}->{'flat'}->{'internalQueue'} = $3;
+		$test->{$currTest}->{'flat'}->{'externalQueue'} = $4;
 		
 		if ($block =~ /State-vector (\d+) byte, depth reached (\d+), errors: (\d+)/) {
 			$test->{$currTest}->{'pml'}->{'states'}->{'stateSize'} = $1;
diff --git a/test/w3c/graphs/data/pml_states.data b/test/w3c/graphs/data/pml_states.data
deleted file mode 100644
index 7381008..0000000
--- a/test/w3c/graphs/data/pml_states.data
+++ /dev/null
@@ -1,84 +0,0 @@
-147, 108, 0.281, 3
-505, 116, 0.276, 6
-348, 108, 0.284, 3
-349, 204, 0.280, 4
-319, 108, 0.283, 3
-527, 196, 0.278, 5
-337, 196, 0.283, 3
-310, 108, 0.283, 5
-404, 108, 0.272, 10
-405, 108, 0.265, 13
-183, 196, 0.283, 3
-533, 124, 0.270, 9
-407, 108, 0.282, 4
-372, 108, 0.283, 4
-413, 108, 0.280, 11
-335, 196, 0.283, 3
-193, 108, 0.280, 4
-550, 108, 0.284, 4
-303, 108, 0.284, 3
-252, 108, 0.276, 8
-387, 108, 0.276, 18
-333, 196, 0.283, 3
-278, 108, 0.284, 4
-529, 196, 0.278, 5
-189, 108, 0.284, 3
-554, 108, 0.284, 5
-504, 124, 0.267, 11
-576, 108, 0.284, 13
-336, 108, 0.280, 4
-409, 108, 0.275, 6
-158, 108, 0.281, 4
-501, 108, 0.284, 3
-205, 204, 0.280, 4
-419, 108, 0.284, 3
-174, 108, 0.284, 3
-250, 100, 0.286, 6
-200, 108, 0.284, 3
-570, 108, 0.259, 10
-186, 204, 0.280, 4
-201, 108, 0.284, 3
-339, 196, 0.283, 3
-421, 108, 0.280, 5
-579, 108, 0.262, 8
-176, 204, 0.280, 4
-237, 108, 0.282, 7
-242, 108, 0.276, 9
-378, 108, 0.282, 4
-412, 108, 0.262, 8
-288, 108, 0.284, 3
-375, 108, 0.281, 4
-396, 112, 0.283, 3
-423, 108, 0.280, 4
-155, 124, 0.283, 3
-198, 204, 0.283, 3
-551, 116, 0.283, 4
-355, 108, 0.285, 4
-403c, 108, 0.279, 9
-416, 108, 0.279, 6
-417, 108, 0.279, 10
-330, 204, 0.279, 4
-376, 108, 0.284, 3
-506, 116, 0.274, 7
-187, 108, 0.284, 6
-318, 124, 0.281, 4
-149, 108, 0.282, 3
-364, 108, 0.279, 29
-173, 108, 0.284, 3
-279, 108, 0.284, 4
-495, 108, 0.280, 4
-287, 108, 0.284, 3
-406, 108, 0.267, 10
-323, 108, 0.284, 3
-553, 108, 0.284, 3
-153, 132, 0.282, 3
-190, 116, 0.280, 4
-377, 108, 0.278, 5
-403b, 108, 0.282, 6
-503, 116, 0.277, 5
-179, 196, 0.283, 3
-321, 108, 0.284, 3
-148, 108, 0.282, 3
-411, 108, 0.280, 4
-403a, 108, 0.275, 5
-144, 108, 0.281, 4
diff --git a/test/w3c/graphs/promela-states.sh b/test/w3c/graphs/promela-states.sh
deleted file mode 100755
index 0cb7589..0000000
--- a/test/w3c/graphs/promela-states.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-ME=`basename $0`
-DIR="$( cd "$( dirname "$0" )" && pwd )"
-
-mkdir ${DIR}/data  &> /dev/null
-
-${DIR}/../analyze_promela_tests.pl w3c pml.states.stateSize pml.memory.actual flat.actualComplexity > ${DIR}/data/pml_states.data
-
-cat ${DIR}/data/pml_states.data | gnuplot -p -e 'plot "-" with lines,"-" with lines'
\ No newline at end of file
diff --git a/test/w3c/graphs/run_gnuplot.sh b/test/w3c/graphs/run_gnuplot.sh
deleted file mode 100755
index 26fe407..0000000
--- a/test/w3c/graphs/run_gnuplot.sh
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-gnuplot test.plot > test.pdf