[Scstudio-commits] SF.net SVN: scstudio:[886] trunk

[<ma...@us...>]

Revision: 886
          http://scstudio.svn.sourceforge.net/scstudio/?rev=886&view=rev
Author:   madzin
Date:     2010-09-08 07:48:34 +0000 (Wed, 08 Sep 2010)

Log Message:
-----------
add z120 tests and repair small bug in z120 save

Modified Paths:
--------------
    trunk/src/data/Z120/z120_save.cpp
    trunk/tests/z120_test/CMakeLists.txt

Added Paths:
-----------
    trunk/tests/z120_test/z120_time32.mpr
    trunk/tests/z120_test/z120_time32.mpr.result
    trunk/tests/z120_test/z120_time33.mpr
    trunk/tests/z120_test/z120_time33.mpr.result
    trunk/tests/z120_test/z120_time34.mpr
    trunk/tests/z120_test/z120_time34.mpr.result
    trunk/tests/z120_test/z120_time35.mpr
    trunk/tests/z120_test/z120_time35.mpr.result
    trunk/tests/z120_test/z120_time36.mpr
    trunk/tests/z120_test/z120_time36.mpr.result
    trunk/tests/z120_test/z120_time37.mpr
    trunk/tests/z120_test/z120_time37.mpr.result
    trunk/tests/z120_test/z120_time38.mpr
    trunk/tests/z120_test/z120_time38.mpr.result
    trunk/tests/z120_test/z120_time39.mpr
    trunk/tests/z120_test/z120_time39.mpr.result
    trunk/tests/z120_test/z120_time40.mpr
    trunk/tests/z120_test/z120_time40.mpr.result
    trunk/tests/z120_test/z120_time41.mpr
    trunk/tests/z120_test/z120_time41.mpr.result
    trunk/tests/z120_test/z120_time42.mpr
    trunk/tests/z120_test/z120_time42.mpr.result
    trunk/tests/z120_test/z120_time43.mpr
    trunk/tests/z120_test/z120_time43.mpr.result
    trunk/tests/z120_test/z120_time44.mpr
    trunk/tests/z120_test/z120_time44.mpr.result
    trunk/tests/z120_test/z120_time45.mpr
    trunk/tests/z120_test/z120_time45.mpr.result
    trunk/tests/z120_test/z120_time46.mpr
    trunk/tests/z120_test/z120_time46.mpr.result
    trunk/tests/z120_test/z120_time47.mpr
    trunk/tests/z120_test/z120_time47.mpr.result
    trunk/tests/z120_test/z120_time48.mpr
    trunk/tests/z120_test/z120_time48.mpr.result
    trunk/tests/z120_test/z120_time49.mpr
    trunk/tests/z120_test/z120_time49.mpr.result

Modified: trunk/src/data/Z120/z120_save.cpp
===================================================================
--- trunk/src/data/Z120/z120_save.cpp	2010-09-08 07:30:40 UTC (rev 885)
+++ trunk/src/data/Z120/z120_save.cpp	2010-09-08 07:48:34 UTC (rev 886)
@@ -375,7 +375,7 @@
       if (it->get_begin_closed())
         stream << "@[";
       else
-        stream << "(";
+        stream << "@(";
 
       stream << it->get_begin() << "," << it->get_end();
 

Modified: trunk/tests/z120_test/CMakeLists.txt
===================================================================
--- trunk/tests/z120_test/CMakeLists.txt	2010-09-08 07:30:40 UTC (rev 885)
+++ trunk/tests/z120_test/CMakeLists.txt	2010-09-08 07:48:34 UTC (rev 886)
@@ -129,6 +129,24 @@
 ADD_Z120_TEST(z120_time29.mpr 1)
 ADD_Z120_TEST(z120_time30.mpr 1)
 ADD_Z120_TEST(z120_time31.mpr 1)
+ADD_Z120_TEST(z120_time32.mpr 1)
+ADD_Z120_TEST(z120_time33.mpr 1)
+ADD_Z120_TEST(z120_time34.mpr 1)
+ADD_Z120_TEST(z120_time35.mpr 1)
+ADD_Z120_TEST(z120_time36.mpr 1)
+ADD_Z120_TEST(z120_time37.mpr 1)
+ADD_Z120_TEST(z120_time38.mpr 1)
+ADD_Z120_TEST(z120_time39.mpr 1)
+ADD_Z120_TEST(z120_time40.mpr 1)
+ADD_Z120_TEST(z120_time41.mpr 1)
+ADD_Z120_TEST(z120_time42.mpr 1)
+ADD_Z120_TEST(z120_time43.mpr 1)
+ADD_Z120_TEST(z120_time44.mpr 1)
+ADD_Z120_TEST(z120_time45.mpr 1)
+ADD_Z120_TEST(z120_time46.mpr 1)
+ADD_Z120_TEST(z120_time47.mpr 1)
+ADD_Z120_TEST(z120_time48.mpr 1)
+ADD_Z120_TEST(z120_time49.mpr 1)
 
 
 # $Id$

Added: trunk/tests/z120_test/z120_time32.mpr
===================================================================
--- trunk/tests/z120_test/z120_time32.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time32.mpr	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+/* Basic time constraints in both MSC and HMSC
+ */
+mscdocument z120_time01;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+top bottom L1 (1,10);
+connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time [@3];
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time32.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time32.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time32.mpr.result	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+OK: z120_time32 is correct, should be correct
+
+mscdocument z120_time32;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+ top bottom L1 (1,10);
+ connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time [@3];
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time33.mpr
===================================================================
--- trunk/tests/z120_test/z120_time33.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time33.mpr	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+/* Basic time constraints in both MSC and HMSC
+ */
+mscdocument z120_time01;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+top bottom L1 (1,10);
+connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time [@3, @4];
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time33.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time33.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time33.mpr.result	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+OK: z120_time33 is correct, should be correct
+
+mscdocument z120_time33;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+ top bottom L1 (1,10);
+ connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @[3,4];
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time34.mpr
===================================================================
--- trunk/tests/z120_test/z120_time34.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time34.mpr	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+/* Basic time constraints in both MSC and HMSC
+ */
+mscdocument z120_time01;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+top bottom L1 (1,10);
+connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @[3,5];
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time34.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time34.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time34.mpr.result	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+OK: z120_time34 is correct, should be correct
+
+mscdocument z120_time34;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+ top bottom L1 (1,10);
+ connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @[3,5];
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time35.mpr
===================================================================
--- trunk/tests/z120_test/z120_time35.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time35.mpr	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+/* Basic time constraints in both MSC and HMSC
+ */
+mscdocument z120_time01;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+top bottom L1 (1,10);
+connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @[3];
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time35.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time35.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time35.mpr.result	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,37 @@
+z120_time35.mpr[18,6] Cannot match to any predicted input.
+Warning: String conversion: empty time interval
+z120_time35.mpr[19,6] Cannot match to any predicted input.
+z120_time35.mpr[22,6] Cannot match to any predicted input.
+Warning 05: Complete message (NAME,1) with only one event
+Warning 05: Complete message (NAME,2) with only one event
+Warning 20: MSC (Subprocess) has unterminated 1 instance
+OK: z120_time35 is correct, should be correct
+
+mscdocument z120_time35;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+ top bottom L1 (1,10);
+ connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+endinstance;
+P2: instance;
+concurrent;
+label e0;
+in NAME,0 from P1 before e1;
+time e2 [12];
+label e1;
+in NAME,1 from found;
+endconcurrent;
+label e2;
+out NAME,2 to lost;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time36.mpr
===================================================================
--- trunk/tests/z120_test/z120_time36.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time36.mpr	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+/* Basic time constraints in both MSC and HMSC
+ */
+mscdocument z120_time01;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+top bottom L1 (1,10);
+connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time [@3);
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time36.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time36.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time36.mpr.result	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,37 @@
+z120_time36.mpr[18,8] Missing ']'.
+OK: z120_time36 is correct, should be correct
+
+mscdocument z120_time36;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+ top bottom L1 (1,10);
+ connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time [@3];
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time37.mpr
===================================================================
--- trunk/tests/z120_test/z120_time37.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time37.mpr	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+/* Basic time constraints in both MSC and HMSC
+ */
+mscdocument z120_time01;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+top bottom L1 (1,10);
+connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time [@3, @4);
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time37.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time37.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time37.mpr.result	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+OK: z120_time37 is correct, should be correct
+
+mscdocument z120_time37;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+ top bottom L1 (1,10);
+ connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @[3,4);
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time38.mpr
===================================================================
--- trunk/tests/z120_test/z120_time38.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time38.mpr	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+/* Basic time constraints in both MSC and HMSC
+ */
+mscdocument z120_time01;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+top bottom L1 (1,10);
+connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time (@3, @4];
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time38.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time38.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time38.mpr.result	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+OK: z120_time38 is correct, should be correct
+
+mscdocument z120_time38;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+ top bottom L1 (1,10);
+ connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @(3,4];
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time39.mpr
===================================================================
--- trunk/tests/z120_test/z120_time39.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time39.mpr	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+/* Basic time constraints in both MSC and HMSC
+ */
+mscdocument z120_time01;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+top bottom L1 (1,10);
+connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time (@3, @4);
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time39.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time39.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time39.mpr.result	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+OK: z120_time39 is correct, should be correct
+
+mscdocument z120_time39;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+ top bottom L1 (1,10);
+ connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @(3,4);
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time40.mpr
===================================================================
--- trunk/tests/z120_test/z120_time40.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time40.mpr	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+/* Basic time constraints in both MSC and HMSC
+ */
+mscdocument z120_time01;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+top bottom L1 (1,10);
+connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time [@3, 4);
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time40.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time40.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time40.mpr.result	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,37 @@
+Warning: wrong definition of absolut time
+OK: z120_time40 is correct, should be correct
+
+mscdocument z120_time40;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+ top bottom L1 (1,10);
+ connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @[3,4);
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time41.mpr
===================================================================
--- trunk/tests/z120_test/z120_time41.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time41.mpr	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+/* Basic time constraints in both MSC and HMSC
+ */
+mscdocument z120_time01;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+top bottom L1 (1,10);
+connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time [@3, 4];
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time41.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time41.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time41.mpr.result	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,37 @@
+Warning: wrong definition of absolut time
+OK: z120_time41 is correct, should be correct
+
+mscdocument z120_time41;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+ top bottom L1 (1,10);
+ connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @[3,4];
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time42.mpr
===================================================================
--- trunk/tests/z120_test/z120_time42.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time42.mpr	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+/* Basic time constraints in both MSC and HMSC
+ */
+mscdocument z120_time01;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+top bottom L1 (1,10);
+connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time [3, @4);
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time42.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time42.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time42.mpr.result	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,37 @@
+Warning: wrong definition of absolut time
+OK: z120_time42 is correct, should be correct
+
+mscdocument z120_time42;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+ top bottom L1 (1,10);
+ connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @[3,4);
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time43.mpr
===================================================================
--- trunk/tests/z120_test/z120_time43.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time43.mpr	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+/* Basic time constraints in both MSC and HMSC
+ */
+mscdocument z120_time01;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+top bottom L1 (1,10);
+connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time (3, @4);
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time43.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time43.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time43.mpr.result	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,37 @@
+Warning: wrong definition of absolut time
+OK: z120_time43 is correct, should be correct
+
+mscdocument z120_time43;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+ top bottom L1 (1,10);
+ connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @(3,4);
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time44.mpr
===================================================================
--- trunk/tests/z120_test/z120_time44.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time44.mpr	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+/* Basic time constraints in both MSC and HMSC
+ */
+mscdocument z120_time01;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+top bottom L1 (1,10);
+connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @(3, 4);
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time44.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time44.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time44.mpr.result	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+OK: z120_time44 is correct, should be correct
+
+mscdocument z120_time44;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+ top bottom L1 (1,10);
+ connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @(3,4);
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time45.mpr
===================================================================
--- trunk/tests/z120_test/z120_time45.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time45.mpr	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+/* Basic time constraints in both MSC and HMSC
+ */
+mscdocument z120_time01;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+top bottom L1 (1,10);
+connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @[3,4);
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time45.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time45.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time45.mpr.result	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+OK: z120_time45 is correct, should be correct
+
+mscdocument z120_time45;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+ top bottom L1 (1,10);
+ connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @[3,4);
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time46.mpr
===================================================================
--- trunk/tests/z120_test/z120_time46.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time46.mpr	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+/* Basic time constraints in both MSC and HMSC
+ */
+mscdocument z120_time01;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+top bottom L1 (1,10);
+connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @(3,4];
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time46.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time46.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time46.mpr.result	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+OK: z120_time46 is correct, should be correct
+
+mscdocument z120_time46;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+ top bottom L1 (1,10);
+ connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @(3,4];
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time47.mpr
===================================================================
--- trunk/tests/z120_test/z120_time47.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time47.mpr	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+/* Basic time constraints in both MSC and HMSC
+ */
+mscdocument z120_time01;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+top bottom L1 (1,10);
+connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @[3,4];
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time47.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time47.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time47.mpr.result	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+OK: z120_time47 is correct, should be correct
+
+mscdocument z120_time47;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+ top bottom L1 (1,10);
+ connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @[3,4];
+label e0;
+out NAME,1 to P2;
+time e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time48.mpr
===================================================================
--- trunk/tests/z120_test/z120_time48.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time48.mpr	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+/* Basic time constraints in both MSC and HMSC
+ */
+mscdocument z120_time01;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+top bottom L1 (1,10);
+connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @(3,4);
+label e0;
+out NAME,1 to P2;
+time e1 [7], [@15];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time48.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time48.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time48.mpr.result	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+OK: z120_time48 is correct, should be correct
+
+mscdocument z120_time48;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+ top bottom L1 (1,10);
+ connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @(3,4);
+label e0;
+out NAME,1 to P2;
+time [@15], e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time49.mpr
===================================================================
--- trunk/tests/z120_test/z120_time49.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_time49.mpr	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+/* Basic time constraints in both MSC and HMSC
+ */
+mscdocument z120_time01;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+top bottom L1 (1,10);
+connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @(3,4);
+label e0;
+out NAME,1 to P2;
+time e1 [7], @[15, 25];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;

Added: trunk/tests/z120_test/z120_time49.mpr.result
===================================================================
--- trunk/tests/z120_test/z120_time49.mpr.result	                        (rev 0)
+++ trunk/tests/z120_test/z120_time49.mpr.result	2010-09-08 07:48:34 UTC (rev 886)
@@ -0,0 +1,36 @@
+OK: z120_time49 is correct, should be correct
+
+mscdocument z120_time49;
+msc Main;
+initial connect L0;
+L0: connect L1, L2;
+L1: reference Subprocess connect L3;
+L2: reference Subprocess time [1,2);
+ top bottom L1 (1,10);
+ connect L1;
+L3: final;
+endmsc;
+msc Subprocess;
+inst P1;
+inst P2;
+P1: instance;
+out NAME,0 to P2;
+time @(3,4);
+label e0;
+out NAME,1 to P2;
+time @[15,25], e1 [7];
+label e1;
+in NAME,2 from P2;
+endinstance;
+P2: instance;
+concurrent;
+label e2;
+in NAME,0 from P1 before e3;
+time e4 [12];
+label e3;
+in NAME,1 from P1;
+endconcurrent;
+label e4;
+out NAME,2 to P1;
+endinstance;
+endmsc;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.