Menu
▾
▴
[Scstudio-commits] SF.net SVN: scstudio:[674] trunk
|
From: <got...@us...> - 2010-03-09 20:32:04
|
Revision: 674
http://scstudio.svn.sourceforge.net/scstudio/?rev=674&view=rev
Author: gotthardp
Date: 2010-03-09 20:31:52 +0000 (Tue, 09 Mar 2010)
Log Message:
-----------
Was printed like this:
/* MARKED */
bottom top L1 [1,3)/* MARKED */
, top L1 [2,5);
Changed to save the /* MARKED */ sign closed to the marked time constraint, i.e. after comma.
Modified Paths:
--------------
trunk/src/data/Z120/z120_save.cpp
trunk/tests/time_constraints/proper_neg1.mpr.result
trunk/tests/time_constraints/proper_neg10.mpr.result
trunk/tests/time_constraints/proper_neg11.mpr.result
trunk/tests/time_constraints/proper_neg12.mpr.result
trunk/tests/time_constraints/proper_neg13.mpr.result
trunk/tests/time_constraints/proper_neg14.mpr.result
trunk/tests/time_constraints/proper_neg15.mpr.result
trunk/tests/time_constraints/proper_neg16.mpr.result
trunk/tests/time_constraints/proper_neg17.mpr.result
trunk/tests/time_constraints/proper_neg18.mpr.result
trunk/tests/time_constraints/proper_neg19.mpr.result
trunk/tests/time_constraints/proper_neg2.mpr.result
trunk/tests/time_constraints/proper_neg20.mpr.result
trunk/tests/time_constraints/proper_neg21.mpr.result
trunk/tests/time_constraints/proper_neg22.mpr.result
trunk/tests/time_constraints/proper_neg23.mpr.result
trunk/tests/time_constraints/proper_neg24.mpr.result
trunk/tests/time_constraints/proper_neg25.mpr.result
trunk/tests/time_constraints/proper_neg26.mpr.result
trunk/tests/time_constraints/proper_neg26.mpr.result.1
trunk/tests/time_constraints/proper_neg27.mpr.result
trunk/tests/time_constraints/proper_neg27.mpr.result.1
trunk/tests/time_constraints/proper_neg28.mpr.result
trunk/tests/time_constraints/proper_neg3.mpr.result
trunk/tests/time_constraints/proper_neg31.mpr.result
trunk/tests/time_constraints/proper_neg35.mpr.result
trunk/tests/time_constraints/proper_neg4.mpr.result
trunk/tests/time_constraints/proper_neg5.mpr.result
trunk/tests/time_constraints/proper_neg6.mpr.result
trunk/tests/time_constraints/proper_neg7.mpr.result
trunk/tests/time_constraints/proper_neg8.mpr.result
trunk/tests/time_constraints/proper_neg9.mpr.result
Modified: trunk/src/data/Z120/z120_save.cpp
===================================================================
--- trunk/src/data/Z120/z120_save.cpp 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/src/data/Z120/z120_save.cpp 2010-03-09 20:31:52 UTC (rev 674)
@@ -377,16 +377,16 @@
if((*rpos)->get_event_a() != event)
continue;
- print_element_attributes(stream, *rpos);
-
// is it a first item being printed?
if(!printed++)
- stream << "time ";
+ stream << "time";
else
- stream << ", ";
+ stream << ",";
- stream << "e" << event_id_map.get_id((*rpos)->get_event_b());
+ print_element_attributes(stream, *rpos);
+ stream << " e" << event_id_map.get_id((*rpos)->get_event_b());
+
if((*rpos)->is_directed())
stream << " origin";
@@ -483,18 +483,18 @@
for(CoregEventRelPtrVector::const_iterator spos = (*epos)->get_successors().begin();
spos != (*epos)->get_successors().end(); spos++)
{
- print_element_attributes(stream, *spos);
-
CoregionEventPtr successor = (*spos)->get_successor();
// is it a first item being printed?
if(spos == (*epos)->get_successors().begin())
- stream << " before ";
+ stream << " before";
else
- stream << ", ";
+ stream << ",";
- stream << "e" << event_id_map.get_id(successor);
+ print_element_attributes(stream, *spos);
+ stream << " e" << event_id_map.get_id(successor);
+
// add successors of this event to the stack
// note: std::list<>::push_back doesn't invalidate iterators
push_back_if_unique<CoregionEventPtr>(event_stack, successor);
@@ -529,15 +529,15 @@
if((*rpos)->get_ref_node_a() != (*rpos)->get_ref_node_b())
continue;
- print_element_attributes(stream, *rpos);
-
// is it a first item being printed?
if(!printed++)
- stream << " time ";
+ stream << " time";
else
- stream << ", ";
+ stream << ",";
- stream << (*rpos)->get_label();
+ print_element_attributes(stream, *rpos);
+
+ stream << " " << (*rpos)->get_label();
}
if(printed)
@@ -562,14 +562,14 @@
if((*rpos)->get_ref_node_a() != reference_node)
continue;
- print_element_attributes(stream, *rpos);
-
// is it a first item being printed?
if(!printed++)
stream << " " << title;
else
stream << ",";
+ print_element_attributes(stream, *rpos);
+
if((*rpos)->get_ref_node_b() == NULL)
throw std::invalid_argument("Disconnected time constraint.");
@@ -693,18 +693,18 @@
for(NodeRelationPtrVector::const_iterator spos = predecessor_node->get_successors().begin();
spos != predecessor_node->get_successors().end(); spos++)
{
- print_element_attributes(stream, *spos);
-
SuccessorNode *successor = (*spos)->get_successor();
// is it a first item being printed?
if(spos == predecessor_node->get_successors().begin())
- stream << " connect ";
+ stream << " connect";
else
- stream << ", ";
+ stream << ",";
+ print_element_attributes(stream, *spos);
+
HMscNode *successor_node = dynamic_cast<HMscNode*>(successor);
- stream << "L" << node_id_map.get_id(successor_node);
+ stream << " L" << node_id_map.get_id(successor_node);
// add successors of this node to the stack
// note: std::list<>::push_back doesn't invalidate iterators
Modified: trunk/tests/time_constraints/proper_neg1.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg1.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg1.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -3,8 +3,8 @@
mscdocument counter_example;
msc Stranka_1;
initial connect L0;
-L0: reference bMSC1/* MARKED */
- top bottom L1 [0,inf);
+L0: reference bMSC1 top/* MARKED */
+ bottom L1 [0,inf);
connect L1, L2;
L1: reference bMSC2 connect L3;
L2: reference bMSC3 connect L4;
Modified: trunk/tests/time_constraints/proper_neg10.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg10.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg10.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -3,8 +3,8 @@
mscdocument counter_example;
msc Stranka_1;
initial connect L0;
-L0: reference bMSC/* MARKED */
- top bottom L1 [0,inf);
+L0: reference bMSC top/* MARKED */
+ bottom L1 [0,inf);
connect L2, L3;
L2: reference bMSC connect L4;
L3: reference bMSC connect L1;
Modified: trunk/tests/time_constraints/proper_neg11.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg11.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg11.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -5,8 +5,8 @@
initial connect L0;
L0: reference bMSC connect L1, L2;
L1: reference bMSC connect L3;
-L2: reference bMSC/* MARKED */
- top bottom L4 [0,inf);
+L2: reference bMSC top/* MARKED */
+ bottom L4 [0,inf);
connect L4;
L3: final;
L4: reference bMSC connect L3, L4;
Modified: trunk/tests/time_constraints/proper_neg12.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg12.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg12.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -4,15 +4,15 @@
msc Stranka_1;
initial connect L0;
L0: reference NAME time [0,inf);
-/* MARKED */
- top top L1 [0,inf);
-/* MARKED */
- bottom top L1 [2,5)/* MARKED */
-, top L1 [1,3);
+ top/* MARKED */
+ top L1 [0,inf);
+ bottom/* MARKED */
+ top L1 [2,5),/* MARKED */
+ top L1 [1,3);
connect L1;
L1: reference NAME time [0,inf), [0,inf);
-/* MARKED */
- top bottom L2 [0,inf);
+ top/* MARKED */
+ bottom L2 [0,inf);
connect L3;
L3: connect L2, L4;
/* MARKED */
@@ -37,8 +37,8 @@
NAME: instance;
label e0;
in NAME,0 from asd;
-/* MARKED */
-time e1 [0,inf);
+time/* MARKED */
+ e1 [0,inf);
endinstance;
asd: instance;
out NAME,0 to NAME;
Modified: trunk/tests/time_constraints/proper_neg13.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg13.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg13.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -4,15 +4,15 @@
msc Stranka_1;
initial connect L0;
L0: reference NAME time [0,inf);
-/* MARKED */
- top top L1 [0,inf);
-/* MARKED */
- bottom top L1 [2,5)/* MARKED */
-, top L1 [1,3);
+ top/* MARKED */
+ top L1 [0,inf);
+ bottom/* MARKED */
+ top L1 [2,5),/* MARKED */
+ top L1 [1,3);
connect L1, L2;
L1: reference NAME time [0,inf), [0,inf);
-/* MARKED */
- top bottom L3 [0,inf);
+ top/* MARKED */
+ bottom L3 [0,inf);
connect L4;
L2: reference NAME time [0,inf);
connect L5;
@@ -39,8 +39,8 @@
NAME: instance;
label e0;
in NAME,0 from asd;
-/* MARKED */
-time e1 [0,inf);
+time/* MARKED */
+ e1 [0,inf);
endinstance;
asd: instance;
out NAME,0 to NAME;
Modified: trunk/tests/time_constraints/proper_neg14.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg14.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg14.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -22,8 +22,8 @@
b: instance;
label e1;
in NAME,1 from c;
-/* MARKED */
-time e0 [0,inf);
+time/* MARKED */
+ e0 [0,inf);
endinstance;
c: instance;
out NAME,1 to b;
Modified: trunk/tests/time_constraints/proper_neg15.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg15.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg15.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -13,14 +13,14 @@
initial connect L0, L1;
/* MARKED */
L0: reference A time [0,inf);
-/* MARKED */
- top top L1 [0,inf)/* MARKED */
-, bottom L1 [0,inf);
+ top/* MARKED */
+ top L1 [0,inf),/* MARKED */
+ bottom L1 [0,inf);
connect L2;
/* MARKED */
L1: reference NAME time [0,inf);
-/* MARKED */
- bottom bottom L0 [0,inf);
+ bottom/* MARKED */
+ bottom L0 [0,inf);
connect L2;
L2: final;
endmsc;
@@ -35,8 +35,8 @@
b: instance;
label e1;
in NAME,1 from c;
-/* MARKED */
-time e0 [0,inf);
+time/* MARKED */
+ e0 [0,inf);
endinstance;
c: instance;
out NAME,1 to b;
Modified: trunk/tests/time_constraints/proper_neg16.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg16.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg16.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -13,8 +13,8 @@
/* MARKED */
L0: reference A connect L2;
/* MARKED */
-L1: reference NAME/* MARKED */
- bottom bottom L0 [0,inf);
+L1: reference NAME bottom/* MARKED */
+ bottom L0 [0,inf);
connect L2;
L2: final;
endmsc;
@@ -31,8 +31,8 @@
out NAME,2 to c;
label e0;
in NAME,3 from c;
-/* MARKED */
-time e1 [0,inf);
+time/* MARKED */
+ e1 [0,inf);
endinstance;
c: instance;
out NAME,3 to b;
Modified: trunk/tests/time_constraints/proper_neg17.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg17.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg17.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -35,8 +35,8 @@
b: instance;
label e1;
in NAME,1 from c;
-/* MARKED */
-time e0 [0,inf);
+time/* MARKED */
+ e0 [0,inf);
endinstance;
c: instance;
out NAME,1 to b;
Modified: trunk/tests/time_constraints/proper_neg18.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg18.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg18.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -19,8 +19,8 @@
/* MARKED */
L0: reference A time [0,inf);
connect L2;
-L1: reference NAME/* MARKED */
- bottom top L0 [0,inf);
+L1: reference NAME bottom/* MARKED */
+ top L0 [0,inf);
connect L2;
L2: final;
endmsc;
Modified: trunk/tests/time_constraints/proper_neg19.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg19.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg19.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -22,8 +22,8 @@
msc NAME;
initial connect L0;
/* MARKED */
-L0: reference A/* MARKED */
- top bottom L1 [0,inf);
+L0: reference A top/* MARKED */
+ bottom L1 [0,inf);
connect L1, L2;
/* MARKED */
L1: reference NAME connect L3;
Modified: trunk/tests/time_constraints/proper_neg2.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg2.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg2.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -4,8 +4,8 @@
msc Stranka_1;
initial connect L0;
L0: reference bMSC1 connect L1, L2;
-L1: reference bMSC2/* MARKED */
- top bottom L2 [0,inf);
+L1: reference bMSC2 top/* MARKED */
+ bottom L2 [0,inf);
connect L3;
L2: reference bMSC3 connect L4;
L3: final;
Modified: trunk/tests/time_constraints/proper_neg20.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg20.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg20.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -6,8 +6,8 @@
mscdocument counter_example;
msc NAME;
initial connect L0;
-L0: reference A/* MARKED */
- top bottom L1 [0,inf);
+L0: reference A top/* MARKED */
+ bottom L1 [0,inf);
connect L1, L2;
/* MARKED */
L1: reference NAME connect L3;
Modified: trunk/tests/time_constraints/proper_neg21.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg21.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg21.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -7,20 +7,20 @@
msc A;
initial connect L0;
/* MARKED */
-L0: reference A/* MARKED */
- top top L1 [0,inf)/* MARKED */
-, bottom L2 [0,inf);
-/* MARKED */
- bottom top L3 [0,inf);
+L0: reference A top/* MARKED */
+ top L1 [0,inf),/* MARKED */
+ bottom L2 [0,inf);
+ bottom/* MARKED */
+ top L3 [0,inf);
connect L1, L4;
L1: reference NAME time [0,inf);
-/* MARKED */
- bottom bottom L3 [0,inf);
+ bottom/* MARKED */
+ bottom L3 [0,inf);
connect L4, L3, L5;
L4: connect L1, L3;
L3: reference NAME time [0,inf);
-/* MARKED */
- top top L2 [0,inf);
+ top/* MARKED */
+ top L2 [0,inf);
connect L6;
L5: condition aa connect L2;
L6: final;
Modified: trunk/tests/time_constraints/proper_neg22.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg22.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg22.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -7,8 +7,8 @@
msc A;
initial connect L0;
/* MARKED */
-L0: reference A bottom top L1 [0,inf)/* MARKED */
-, top L2 [0,inf);
+L0: reference A bottom top L1 [0,inf),/* MARKED */
+ top L2 [0,inf);
connect L2, L3;
L2: reference NAME time [0,inf);
connect L1;
Modified: trunk/tests/time_constraints/proper_neg23.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg23.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg23.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -7,8 +7,8 @@
msc A;
initial connect L0;
/* MARKED */
-L0: reference A bottom top L1 [0,inf)/* MARKED */
-, top L2 [0,inf);
+L0: reference A bottom top L1 [0,inf),/* MARKED */
+ top L2 [0,inf);
connect L2, L3;
L2: reference NAME time [0,inf);
connect L1;
Modified: trunk/tests/time_constraints/proper_neg24.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg24.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg24.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -7,8 +7,8 @@
msc A;
initial connect L0;
/* MARKED */
-L0: reference A bottom top L1 [0,inf)/* MARKED */
-, top L2 [0,inf);
+L0: reference A bottom top L1 [0,inf),/* MARKED */
+ top L2 [0,inf);
connect L2, L3;
L2: reference NAME time [0,inf);
connect L1;
Modified: trunk/tests/time_constraints/proper_neg25.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg25.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg25.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -10,8 +10,8 @@
L0: reference A bottom top L1 [0,inf);
connect L2, L3;
L2: reference NAME time [0,inf);
-/* MARKED */
- top bottom L4 [0,inf);
+ top/* MARKED */
+ bottom L4 [0,inf);
connect L1;
L3: connect L2, L1;
L1: reference NAME time [0,inf);
Modified: trunk/tests/time_constraints/proper_neg26.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg26.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg26.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -30,8 +30,8 @@
dsrgdf: instance;
label e0;
in NAME,0 from asd;
-/* MARKED */
-time e1 [0,inf);
+time/* MARKED */
+ e1 [0,inf);
in NAME,1 from NAME;
endinstance;
NAME: instance;
Modified: trunk/tests/time_constraints/proper_neg26.mpr.result.1
===================================================================
--- trunk/tests/time_constraints/proper_neg26.mpr.result.1 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg26.mpr.result.1 2010-03-09 20:31:52 UTC (rev 674)
@@ -46,8 +46,8 @@
dsrgdf: instance;
label e0;
in NAME,0 from asd;
-/* MARKED */
-time e1 [0,inf);
+time/* MARKED */
+ e1 [0,inf);
in NAME,1 from NAME;
endinstance;
NAME: instance;
Modified: trunk/tests/time_constraints/proper_neg27.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg27.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg27.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -30,8 +30,8 @@
dsrgdf: instance;
label e0;
in NAME,0 from asd;
-/* MARKED */
-time e1 [0,inf);
+time/* MARKED */
+ e1 [0,inf);
in NAME,1 from NAME;
endinstance;
NAME: instance;
Modified: trunk/tests/time_constraints/proper_neg27.mpr.result.1
===================================================================
--- trunk/tests/time_constraints/proper_neg27.mpr.result.1 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg27.mpr.result.1 2010-03-09 20:31:52 UTC (rev 674)
@@ -42,8 +42,8 @@
dsrgdf: instance;
label e0;
in NAME,0 from asd;
-/* MARKED */
-time e1 [0,inf);
+time/* MARKED */
+ e1 [0,inf);
in NAME,1 from NAME;
endinstance;
NAME: instance;
Modified: trunk/tests/time_constraints/proper_neg28.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg28.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg28.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -16,8 +16,8 @@
dsrgdf: instance;
label e0;
in NAME,0 from asd;
-/* MARKED */
-time e1 [0,inf);
+time/* MARKED */
+ e1 [0,inf);
in NAME,1 from NAME;
endinstance;
NAME: instance;
Modified: trunk/tests/time_constraints/proper_neg3.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg3.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg3.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -5,8 +5,8 @@
initial connect L0;
L0: reference bMSC1 connect L1, L2;
L1: reference bMSC2 connect L3;
-L2: reference bMSC3/* MARKED */
- top bottom L4 [0,inf);
+L2: reference bMSC3 top/* MARKED */
+ bottom L4 [0,inf);
connect L2, L4;
L3: final;
L4: reference bMSC4 connect L3;
Modified: trunk/tests/time_constraints/proper_neg31.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg31.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg31.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -5,8 +5,8 @@
p: instance;
label e0;
out NAME,0 to q;
-/* MARKED */
-time e1 (-inf,-1], e2 [1];
+time/* MARKED */
+ e1 (-inf,-1], e2 [1];
label e1;
out NAME,1 to q;
time e3 [100];
Modified: trunk/tests/time_constraints/proper_neg35.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg35.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg35.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -9,8 +9,8 @@
concurrent;
label e0;
out x,0 to c;
-/* MARKED */
-time e1 [0,inf);
+time/* MARKED */
+ e1 [0,inf);
label e1;
in y,1 from b;
endconcurrent;
Modified: trunk/tests/time_constraints/proper_neg4.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg4.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg4.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -5,8 +5,8 @@
initial connect L0;
L0: reference bMSC1 connect L1, L2;
L1: reference bMSC2 connect L3;
-L2: reference bMSC3/* MARKED */
- top bottom L4 [0,inf);
+L2: reference bMSC3 top/* MARKED */
+ bottom L4 [0,inf);
connect L4;
L3: final;
L4: reference bMSC4 connect L3, L4;
Modified: trunk/tests/time_constraints/proper_neg5.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg5.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg5.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -5,8 +5,8 @@
initial connect L0;
L0: reference bMSC1 connect L1, L2;
L1: reference bMSC2 connect L3;
-L2: reference bMSC3/* MARKED */
- bottom top L4 [0,inf);
+L2: reference bMSC3 bottom/* MARKED */
+ top L4 [0,inf);
connect L4;
L3: final;
L4: reference bMSC4 connect L3, L4;
Modified: trunk/tests/time_constraints/proper_neg6.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg6.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg6.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -5,8 +5,8 @@
initial connect L0;
L0: reference bMSC1 connect L1, L2;
L1: reference bMSC2 connect L3;
-L2: reference bMSC3/* MARKED */
- bottom top L4 [0,inf);
+L2: reference bMSC3 bottom/* MARKED */
+ top L4 [0,inf);
connect L4;
L3: final;
L4: reference bMSC4 connect L3, L2, L4;
Modified: trunk/tests/time_constraints/proper_neg7.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg7.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg7.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -5,8 +5,8 @@
initial connect L0;
L0: reference bMSC1 connect L1, L2;
L1: reference bMSC2 connect L3;
-L2: reference bMSC3/* MARKED */
- top bottom L4 [0,inf);
+L2: reference bMSC3 top/* MARKED */
+ bottom L4 [0,inf);
connect L4;
L3: final;
L4: reference bMSC4 connect L3, L2, L4;
Modified: trunk/tests/time_constraints/proper_neg8.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg8.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg8.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -13,8 +13,8 @@
connect L2;
L2: reference NAME connect L3;
L3: connect L1, L4;
-L1: reference NAME2/* MARKED */
- bottom top L2 [0,inf);
+L1: reference NAME2 bottom/* MARKED */
+ top L2 [0,inf);
connect L5;
L4: connect L2;
L5: final;
Modified: trunk/tests/time_constraints/proper_neg9.mpr.result
===================================================================
--- trunk/tests/time_constraints/proper_neg9.mpr.result 2010-03-09 17:40:52 UTC (rev 673)
+++ trunk/tests/time_constraints/proper_neg9.mpr.result 2010-03-09 20:31:52 UTC (rev 674)
@@ -5,8 +5,8 @@
initial connect L0;
L0: reference bMSC connect L1, L2;
L1: reference bMSC connect L3;
-L2: reference bMSC/* MARKED */
- top bottom L4 [0,inf);
+L2: reference bMSC top/* MARKED */
+ bottom L4 [0,inf);
connect L4;
L3: final;
L4: reference bMSC connect L3, L2, L4;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
