Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[1191] trunk
|
From: <ma...@us...> - 2011-09-13 13:48:31
|
Revision: 1191
http://scstudio.svn.sourceforge.net/scstudio/?rev=1191&view=rev
Author: madzin
Date: 2011-09-13 13:48:20 +0000 (Tue, 13 Sep 2011)
Log Message:
-----------
Add prerequisity and add results of some tests.
Modified Paths:
--------------
trunk/src/membership/membership_alg.cpp
trunk/tests/membership/CMakeLists.txt
trunk/tests/membership/partial_mem_easy_pat1.mpr.result
trunk/tests/membership/partial_mem_easy_pat2.mpr.result
trunk/tests/membership/partial_mem_easy_pat3.mpr.result
trunk/tests/membership/partial_mem_easy_pat4.mpr.result
Added Paths:
-----------
trunk/tests/membership/complete_partial_pat1.mpr.result
trunk/tests/membership/complete_partial_pat2.mpr.result
trunk/tests/membership/rozcvicka_bmsc1.mpr
trunk/tests/membership/rozcvicka_bmsc1.mpr.result
trunk/tests/membership/rozcvicka_bmsc2.mpr.result
trunk/tests/membership/test_bmsc20_1.mpr.result
trunk/tests/membership/test_bmsc20_2.mpr.result
trunk/tests/membership/test_bmsc27_1.mpr.result
Removed Paths:
-------------
trunk/tests/membership/rozcvicka_bmsc.mpr
trunk/tests/membership/rozcvicka_bmsc.mpr.result
Modified: trunk/src/membership/membership_alg.cpp
===================================================================
--- trunk/src/membership/membership_alg.cpp 2011-09-13 11:05:06 UTC (rev 1190)
+++ trunk/src/membership/membership_alg.cpp 2011-09-13 13:48:20 UTC (rev 1191)
@@ -28,6 +28,7 @@
result.push_back(PrerequisiteCheck(L"Unique instance names", PrerequisiteCheck::PP_REQUIRED));
result.push_back(PrerequisiteCheck(L"Correct Time Constraint Syntax", PrerequisiteCheck::PP_REQUIRED));
result.push_back(PrerequisiteCheck(L"Time Consistent", PrerequisiteCheck::PP_REQUIRED));
+ result.push_back(PrerequisiteCheck(L"Acyclic", PrerequisiteCheck::PP_REQUIRED));
return result;
}
@@ -230,6 +231,9 @@
std::vector<MscPtr> msc_for_cover;
+ if(!instances.empty())
+ print_report(RS_WARNING, L"Find Flow algorithm in partial mode is not albe to check time constraints.");
+
for(unsigned int i = 0; i < bmscs.size(); i++)
{
temp = NULL;
Modified: trunk/tests/membership/CMakeLists.txt
===================================================================
--- trunk/tests/membership/CMakeLists.txt 2011-09-13 11:05:06 UTC (rev 1190)
+++ trunk/tests/membership/CMakeLists.txt 2011-09-13 13:48:20 UTC (rev 1191)
@@ -104,8 +104,8 @@
ADD_MEMBER_TEST(BMSCxBMSC4.mpr BMSCxBMSC4.mpr 1)
#rozcvicka
-ADD_MEMBER_TEST(rozcvicka_hmsc.mpr rozcvicka_bmsc.mpr 1)
-ADD_MEMBER_TEST(rozcvicka_long.mpr rozcvicka_bmsc.mpr 1)
+ADD_MEMBER_TEST(rozcvicka_hmsc.mpr rozcvicka_bmsc1.mpr 1)
+ADD_MEMBER_TEST(rozcvicka_long.mpr rozcvicka_bmsc2.mpr 1)
#test coregion ordering skontrolovat
ADD_MEMBER_TEST(test_hmsc20.mpr test_bmsc20_1.mpr 1)
Added: trunk/tests/membership/complete_partial_pat1.mpr.result
===================================================================
--- trunk/tests/membership/complete_partial_pat1.mpr.result (rev 0)
+++ trunk/tests/membership/complete_partial_pat1.mpr.result 2011-09-13 13:48:20 UTC (rev 1191)
@@ -0,0 +1,121 @@
+Find Flow algorithm in partial mode is not albe to check time constraints.
+Flow "Page_1" found on instances: PC.
+Diagram with found flow highlighted.
+mscdocument complete;
+msc Page_1;
+/* PATH */
+initial connect/* PATH */
+ L0;
+/* PATH */
+/* ATTRIBUTES: [membership_counter 1] */
+L0: reference A/* PATH */
+ connect/* PATH */
+ L1;
+/* PATH */
+L1:/* PATH */
+ connect L2,/* PATH */
+ L3;
+L2: reference C top bottom L4 [4,5];
+ bottom top L4 [2,3);
+ connect L4;
+/* PATH */
+/* ATTRIBUTES: [membership_counter 1] */
+L3: reference B time [1];
+/* PATH */
+ connect/* PATH */
+ L5;
+L4: reference D connect L5;
+/* PATH */
+L5:/* PATH */
+ connect/* PATH */
+ L6;
+/* PATH */
+L6: final/* PATH */
+;
+endmsc;
+msc A;
+inst PC;
+inst Router;
+inst Server;
+PC: instance;
+label e0;
+out c,0 to Router;
+time e1 [0,1);
+endinstance;
+Router: instance;
+concurrent;
+label e1;
+in c,0 from PC;
+label e2;
+out a,1 to Server before e3;
+time e3 [1,2];
+label e3;
+out b,2 to Server;
+endconcurrent;
+endinstance;
+Server: instance;
+in a,1 from Router;
+in b,2 from Router;
+endinstance;
+endmsc;
+msc C;
+inst PC;
+inst Router;
+inst Server;
+PC: instance;
+out a,0 to Router;
+out a,1 to Router;
+endinstance;
+Router: instance;
+in a,0 from PC;
+in b,2 from Server;
+in a,1 from PC;
+endinstance;
+Server: instance;
+out b,2 to Router;
+endinstance;
+endmsc;
+msc B;
+inst PC;
+inst Router;
+inst Server;
+PC: instance;
+in c,0 from Server;
+out b,1 to Router;
+endinstance;
+Router: instance;
+in c,2 from Server;
+in b,1 from PC;
+endinstance;
+Server: instance;
+concurrent;
+out c,2 to Router;
+out c,0 to PC;
+endconcurrent;
+endinstance;
+endmsc;
+msc D;
+inst PC;
+inst Router;
+inst Server;
+PC: instance;
+in b,0 from Router;
+out c,1 to Router;
+endinstance;
+Router: instance;
+concurrent;
+in a,2 from Server;
+in a,3 from Server;
+in b,4 from Server;
+out b,0 to PC;
+endconcurrent;
+in c,1 from PC;
+endinstance;
+Server: instance;
+concurrent;
+out a,2 to Router;
+out a,3 to Router;
+out b,4 to Router;
+endconcurrent;
+endinstance;
+endmsc;
Added: trunk/tests/membership/complete_partial_pat2.mpr.result
===================================================================
--- trunk/tests/membership/complete_partial_pat2.mpr.result (rev 0)
+++ trunk/tests/membership/complete_partial_pat2.mpr.result 2011-09-13 13:48:20 UTC (rev 1191)
@@ -0,0 +1,125 @@
+Find Flow algorithm in partial mode is not albe to check time constraints.
+Flow "Page_1" found on instances: PC, Router, Server.
+Diagram with found flow highlighted.
+mscdocument complete;
+msc Page_1;
+/* PATH */
+initial connect/* PATH */
+ L0;
+/* PATH */
+/* ATTRIBUTES: [membership_counter 1] */
+L0: reference A/* PATH */
+ connect/* PATH */
+ L1;
+/* PATH */
+L1:/* PATH */
+ connect/* PATH */
+ L2, L3;
+/* PATH */
+/* ATTRIBUTES: [membership_counter 1] */
+L2: reference C top bottom L4 [4,5];
+ bottom top L4 [2,3);
+/* PATH */
+ connect/* PATH */
+ L4;
+L3: reference B time [1];
+ connect L5;
+/* PATH */
+/* ATTRIBUTES: [membership_counter 1] */
+L4: reference D/* PATH */
+ connect/* PATH */
+ L5;
+/* PATH */
+L5:/* PATH */
+ connect/* PATH */
+ L6;
+/* PATH */
+L6: final/* PATH */
+;
+endmsc;
+msc A;
+inst PC;
+inst Router;
+inst Server;
+PC: instance;
+label e0;
+out c,0 to Router;
+time e1 [0,1);
+endinstance;
+Router: instance;
+concurrent;
+label e1;
+in c,0 from PC;
+label e2;
+out a,1 to Server before e3;
+time e3 [1,2];
+label e3;
+out b,2 to Server;
+endconcurrent;
+endinstance;
+Server: instance;
+in a,1 from Router;
+in b,2 from Router;
+endinstance;
+endmsc;
+msc C;
+inst PC;
+inst Router;
+inst Server;
+PC: instance;
+out a,0 to Router;
+out a,1 to Router;
+endinstance;
+Router: instance;
+in a,0 from PC;
+in b,2 from Server;
+in a,1 from PC;
+endinstance;
+Server: instance;
+out b,2 to Router;
+endinstance;
+endmsc;
+msc B;
+inst PC;
+inst Router;
+inst Server;
+PC: instance;
+in c,0 from Server;
+out b,1 to Router;
+endinstance;
+Router: instance;
+in c,2 from Server;
+in b,1 from PC;
+endinstance;
+Server: instance;
+concurrent;
+out c,2 to Router;
+out c,0 to PC;
+endconcurrent;
+endinstance;
+endmsc;
+msc D;
+inst PC;
+inst Router;
+inst Server;
+PC: instance;
+in b,0 from Router;
+out c,1 to Router;
+endinstance;
+Router: instance;
+concurrent;
+in a,2 from Server;
+in a,3 from Server;
+in b,4 from Server;
+out b,0 to PC;
+endconcurrent;
+in c,1 from PC;
+endinstance;
+Server: instance;
+concurrent;
+out a,2 to Router;
+out a,3 to Router;
+out b,4 to Router;
+endconcurrent;
+endinstance;
+endmsc;
Modified: trunk/tests/membership/partial_mem_easy_pat1.mpr.result
===================================================================
--- trunk/tests/membership/partial_mem_easy_pat1.mpr.result 2011-09-13 11:05:06 UTC (rev 1190)
+++ trunk/tests/membership/partial_mem_easy_pat1.mpr.result 2011-09-13 13:48:20 UTC (rev 1191)
@@ -1 +1,2 @@
+Find Flow algorithm in partial mode is not albe to check time constraints.
Flow "Page_1" found on instances: A.
Modified: trunk/tests/membership/partial_mem_easy_pat2.mpr.result
===================================================================
--- trunk/tests/membership/partial_mem_easy_pat2.mpr.result 2011-09-13 11:05:06 UTC (rev 1190)
+++ trunk/tests/membership/partial_mem_easy_pat2.mpr.result 2011-09-13 13:48:20 UTC (rev 1191)
@@ -1 +1,2 @@
+Find Flow algorithm in partial mode is not albe to check time constraints.
Flow "Page_1" not found on instances: A, B
Modified: trunk/tests/membership/partial_mem_easy_pat3.mpr.result
===================================================================
--- trunk/tests/membership/partial_mem_easy_pat3.mpr.result 2011-09-13 11:05:06 UTC (rev 1190)
+++ trunk/tests/membership/partial_mem_easy_pat3.mpr.result 2011-09-13 13:48:20 UTC (rev 1191)
@@ -1 +1,2 @@
+Find Flow algorithm in partial mode is not albe to check time constraints.
Flow "Page_1" found on instances: A, B.
Modified: trunk/tests/membership/partial_mem_easy_pat4.mpr.result
===================================================================
--- trunk/tests/membership/partial_mem_easy_pat4.mpr.result 2011-09-13 11:05:06 UTC (rev 1190)
+++ trunk/tests/membership/partial_mem_easy_pat4.mpr.result 2011-09-13 13:48:20 UTC (rev 1191)
@@ -1 +1,2 @@
+Find Flow algorithm in partial mode is not albe to check time constraints.
Flow "Page_1" found on instances: A, B, C.
Deleted: trunk/tests/membership/rozcvicka_bmsc.mpr
===================================================================
--- trunk/tests/membership/rozcvicka_bmsc.mpr 2011-09-13 11:05:06 UTC (rev 1190)
+++ trunk/tests/membership/rozcvicka_bmsc.mpr 2011-09-13 13:48:20 UTC (rev 1191)
@@ -1,24 +0,0 @@
-mscdocument Rozcvicka_bmsc;
-msc cele;
-inst Client;
-inst Proxy;
-inst Application_server;
-Client: instance;
-out Register,0 to Proxy;
-in Response,1 from Proxy;
-out Message,2 to Application_server;
-in Response,3 from Application_server;
-endinstance;
-Proxy: instance;
-in Register,0 from Client;
-out Response,1 to Client;
-out Register,4 to Application_server;
-in Response,5 from Application_server;
-endinstance;
-Application_server: instance;
-in Register,4 from Proxy;
-out Response,5 to Proxy;
-in Message,2 from Client;
-out Response,3 to Client;
-endinstance;
-endmsc;
Deleted: trunk/tests/membership/rozcvicka_bmsc.mpr.result
===================================================================
--- trunk/tests/membership/rozcvicka_bmsc.mpr.result 2011-09-13 11:05:06 UTC (rev 1190)
+++ trunk/tests/membership/rozcvicka_bmsc.mpr.result 2011-09-13 13:48:20 UTC (rev 1191)
@@ -1,55 +0,0 @@
-Flow "cele" found.
-Diagram with found flow highlighted.
-mscdocument rozcvicka_hmsc;
-msc HMSC;
-/* PATH */
-initial connect/* PATH */
- L0;
-/* PATH */
-/* ATTRIBUTES: [membership_counter 1] */
-L0: reference prvni/* PATH */
- connect/* PATH */
- L1;
-/* PATH */
-/* ATTRIBUTES: [membership_counter 1] */
-L1: reference druhy/* PATH */
- connect/* PATH */
- L2;
-/* PATH */
-L2: final/* PATH */
-;
-endmsc;
-msc prvni;
-inst Client;
-inst Proxy;
-inst Application_server;
-Client: instance;
-out Register,0 to Proxy;
-in Response,1 from Proxy;
-endinstance;
-Proxy: instance;
-in Register,0 from Client;
-out Response,1 to Client;
-endinstance;
-Application_server: instance;
-endinstance;
-endmsc;
-msc druhy;
-inst Client;
-inst Proxy;
-inst Application_server;
-Client: instance;
-out Message,0 to Application_server;
-in Response,1 from Application_server;
-endinstance;
-Proxy: instance;
-out Register,2 to Application_server;
-in Response,3 from Application_server;
-endinstance;
-Application_server: instance;
-in Register,2 from Proxy;
-out Response,3 to Proxy;
-in Message,0 from Client;
-out Response,1 to Client;
-endinstance;
-endmsc;
Added: trunk/tests/membership/rozcvicka_bmsc1.mpr
===================================================================
--- trunk/tests/membership/rozcvicka_bmsc1.mpr (rev 0)
+++ trunk/tests/membership/rozcvicka_bmsc1.mpr 2011-09-13 13:48:20 UTC (rev 1191)
@@ -0,0 +1,24 @@
+mscdocument Rozcvicka_bmsc;
+msc cele;
+inst Client;
+inst Proxy;
+inst Application_server;
+Client: instance;
+out Register,0 to Proxy;
+in Response,1 from Proxy;
+out Message,2 to Application_server;
+in Response,3 from Application_server;
+endinstance;
+Proxy: instance;
+in Register,0 from Client;
+out Response,1 to Client;
+out Register,4 to Application_server;
+in Response,5 from Application_server;
+endinstance;
+Application_server: instance;
+in Register,4 from Proxy;
+out Response,5 to Proxy;
+in Message,2 from Client;
+out Response,3 to Client;
+endinstance;
+endmsc;
Added: trunk/tests/membership/rozcvicka_bmsc1.mpr.result
===================================================================
--- trunk/tests/membership/rozcvicka_bmsc1.mpr.result (rev 0)
+++ trunk/tests/membership/rozcvicka_bmsc1.mpr.result 2011-09-13 13:48:20 UTC (rev 1191)
@@ -0,0 +1,55 @@
+Flow "cele" found.
+Diagram with found flow highlighted.
+mscdocument rozcvicka_hmsc;
+msc HMSC;
+/* PATH */
+initial connect/* PATH */
+ L0;
+/* PATH */
+/* ATTRIBUTES: [membership_counter 1] */
+L0: reference prvni/* PATH */
+ connect/* PATH */
+ L1;
+/* PATH */
+/* ATTRIBUTES: [membership_counter 1] */
+L1: reference druhy/* PATH */
+ connect/* PATH */
+ L2;
+/* PATH */
+L2: final/* PATH */
+;
+endmsc;
+msc prvni;
+inst Client;
+inst Proxy;
+inst Application_server;
+Client: instance;
+out Register,0 to Proxy;
+in Response,1 from Proxy;
+endinstance;
+Proxy: instance;
+in Register,0 from Client;
+out Response,1 to Client;
+endinstance;
+Application_server: instance;
+endinstance;
+endmsc;
+msc druhy;
+inst Client;
+inst Proxy;
+inst Application_server;
+Client: instance;
+out Message,0 to Application_server;
+in Response,1 from Application_server;
+endinstance;
+Proxy: instance;
+out Register,2 to Application_server;
+in Response,3 from Application_server;
+endinstance;
+Application_server: instance;
+in Register,2 from Proxy;
+out Response,3 to Proxy;
+in Message,0 from Client;
+out Response,1 to Client;
+endinstance;
+endmsc;
Added: trunk/tests/membership/rozcvicka_bmsc2.mpr.result
===================================================================
--- trunk/tests/membership/rozcvicka_bmsc2.mpr.result (rev 0)
+++ trunk/tests/membership/rozcvicka_bmsc2.mpr.result 2011-09-13 13:48:20 UTC (rev 1191)
@@ -0,0 +1,85 @@
+Flow "cele" found.
+Diagram with found flow highlighted.
+mscdocument rozcvicka_long;
+msc HMSC;
+/* PATH */
+initial connect/* PATH */
+ L0;
+/* PATH */
+L0:/* PATH */
+ connect L1,/* PATH */
+ L2;
+L1: reference Query_Error connect L0;
+/* PATH */
+/* ATTRIBUTES: [membership_counter 1] */
+L2: reference Client_registration/* PATH */
+ connect/* PATH */
+ L3;
+/* PATH */
+/* ATTRIBUTES: [membership_counter 1] */
+L3: reference Server_registration/* PATH */
+ connect/* PATH */
+ L4;
+/* PATH */
+L4:/* PATH */
+/* PATH */
+ connect/* PATH */
+ L5,/* PATH */
+ L6;
+/* PATH */
+/* ATTRIBUTES: [membership_counter 1] */
+L5: reference Query_OK/* PATH */
+ connect/* PATH */
+ L4;
+/* PATH */
+L6: final/* PATH */
+;
+endmsc;
+msc Query_Error;
+inst Client;
+inst Application_server;
+Client: instance;
+out Message,0 to Application_server;
+in NOK,1 from Application_server;
+endinstance;
+Application_server: instance;
+in Message,0 from Client;
+out NOK,1 to Client;
+endinstance;
+endmsc;
+msc Client_registration;
+inst Client;
+inst Proxy;
+Client: instance;
+out Register,0 to Proxy;
+in Response,1 from Proxy;
+endinstance;
+Proxy: instance;
+in Register,0 from Client;
+out Response,1 to Client;
+endinstance;
+endmsc;
+msc Server_registration;
+inst Application_server;
+inst Proxy;
+Application_server: instance;
+in Register,0 from Proxy;
+out Response,1 to Proxy;
+endinstance;
+Proxy: instance;
+out Register,0 to Application_server;
+in Response,1 from Application_server;
+endinstance;
+endmsc;
+msc Query_OK;
+inst Client;
+inst Application_server;
+Client: instance;
+out Message,0 to Application_server;
+in Response,1 from Application_server;
+endinstance;
+Application_server: instance;
+in Message,0 from Client;
+out Response,1 to Client;
+endinstance;
+endmsc;
Added: trunk/tests/membership/test_bmsc20_1.mpr.result
===================================================================
--- trunk/tests/membership/test_bmsc20_1.mpr.result (rev 0)
+++ trunk/tests/membership/test_bmsc20_1.mpr.result 2011-09-13 13:48:20 UTC (rev 1191)
@@ -0,0 +1,31 @@
+Flow "Test" found.
+Diagram with found flow highlighted.
+mscdocument test_hmsc20;
+msc Page_1;
+/* PATH */
+initial connect/* PATH */
+ L0;
+/* PATH */
+/* ATTRIBUTES: [membership_counter 1] */
+L0: reference Test/* PATH */
+ connect/* PATH */
+ L1;
+/* PATH */
+L1: final/* PATH */
+;
+endmsc;
+msc Test;
+inst A;
+inst B;
+A: instance;
+out a,0 to B;
+out a,1 to B;
+endinstance;
+B: instance;
+concurrent;
+in a,0 from A before e0;
+label e0;
+in a,1 from A;
+endconcurrent;
+endinstance;
+endmsc;
Added: trunk/tests/membership/test_bmsc20_2.mpr.result
===================================================================
--- trunk/tests/membership/test_bmsc20_2.mpr.result (rev 0)
+++ trunk/tests/membership/test_bmsc20_2.mpr.result 2011-09-13 13:48:20 UTC (rev 1191)
@@ -0,0 +1 @@
+Flow "Test" not found.
Added: trunk/tests/membership/test_bmsc27_1.mpr.result
===================================================================
--- trunk/tests/membership/test_bmsc27_1.mpr.result (rev 0)
+++ trunk/tests/membership/test_bmsc27_1.mpr.result 2011-09-13 13:48:20 UTC (rev 1191)
@@ -0,0 +1 @@
+Flow "Page_1" found.
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
