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

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

Revision: 865
          http://scstudio.svn.sourceforge.net/scstudio/?rev=865&view=rev
Author:   madzin
Date:     2010-08-30 16:42:17 +0000 (Mon, 30 Aug 2010)

Log Message:
-----------
Repair relationships in remove_event method of aoregion area and add test

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

Added Paths:
-----------
    trunk/tests/z120_test/z120_test89.mpr

Modified: trunk/src/data/msc.cpp
===================================================================
--- trunk/src/data/msc.cpp	2010-08-29 21:22:38 UTC (rev 864)
+++ trunk/src/data/msc.cpp	2010-08-30 16:42:17 UTC (rev 865)
@@ -321,13 +321,21 @@
 
 void CoregionArea::remove_event(CoregionEventPtr e)
 {
-  //remove connections between event's predecessors
+  CoregEventRelPtrVector successors_rel = e->get_successors();
   CoregEventRelPtrVector predecessors_rel = e->get_predecessors();
   CoregionEvent* predecessor;
 
   for(unsigned int i = 0; i < predecessors_rel.size(); i++)
   {
     predecessor = predecessors_rel[i]->get_predecessor();
+    
+    //set relations among event's successors and predecessors
+    for(unsigned j = 0; j < successors_rel.size(); j++)
+    {
+      predecessor->add_successor(successors_rel[j]);
+    }
+
+    //remove connection between event's predecessor and event
     predecessor->remove_successor(predecessors_rel[i]);
   }
 

Modified: trunk/tests/z120_test/CMakeLists.txt
===================================================================
--- trunk/tests/z120_test/CMakeLists.txt	2010-08-29 21:22:38 UTC (rev 864)
+++ trunk/tests/z120_test/CMakeLists.txt	2010-08-30 16:42:17 UTC (rev 865)
@@ -96,6 +96,7 @@
 ADD_Z120_TEST(z120_test86.mpr 1)
 ADD_Z120_TEST(z120_test87.mpr 1)
 ADD_Z120_TEST(z120_test88.mpr 1)
+ADD_Z120_TEST(z120_test89.mpr 1)
 
 ADD_Z120_TEST(z120_time01.mpr 1)
 ADD_Z120_TEST(z120_time02.mpr 1)

Added: trunk/tests/z120_test/z120_test89.mpr
===================================================================
--- trunk/tests/z120_test/z120_test89.mpr	                        (rev 0)
+++ trunk/tests/z120_test/z120_test89.mpr	2010-08-30 16:42:17 UTC (rev 865)
@@ -0,0 +1,25 @@
+mscdocument z120_test89;
+msc Strnka1;
+inst PC;
+inst Server;
+PC: instance;
+out SYN,0 to Server;
+in SYNACK,1 from Server;
+out ACK,2 to Server;
+out request_a,3 to Server;
+out request_b,4 to Server;
+in result,5 from Server;
+endinstance;
+Server: instance;
+in SYN,0 from PC;
+out SYNACK,1 to PC;
+in ACK,2 from PC;
+concurrent;
+in request_a,3 from PC before e2;
+label e0;
+out result,5 to PC after e2;
+label e1;
+in request_b,4 from PC before e2 after e2;
+endconcurrent;
+endinstance;
+endmsc;


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