Menu
▾
▴
scstudio-commits
|
From: <ba...@us...> - 2008-03-06 21:01:22
|
Revision: 4
http://scstudio.svn.sourceforge.net/scstudio/?rev=4&view=rev
Author: babicaj
Date: 2008-03-06 13:01:17 -0800 (Thu, 06 Mar 2008)
Log Message:
-----------
Current event order representation at process isn't able to describe all situations. This must be refined, there was added warning about this situation.
Modified Paths:
--------------
trunk/src/data/msc.h
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-03-06 19:14:47 UTC (rev 3)
+++ trunk/src/data/msc.h 2008-03-06 21:01:17 UTC (rev 4)
@@ -120,6 +120,9 @@
*
* Note that if two events have same m_order it means that they are
* unordered (coregion like).
+ * @warning this must be remake, consider situation of three events a,b,c
+ * where only a<b but the rest is unordered. Event order(at process) representation must
+ * be refined in the sense of being able to describe acyclic directed graph.
*/
int m_order;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ba...@us...> - 2008-03-10 20:31:44
|
Revision: 7
http://scstudio.svn.sourceforge.net/scstudio/?rev=7&view=rev
Author: babicaj
Date: 2008-03-10 13:31:26 -0700 (Mon, 10 Mar 2008)
Log Message:
-----------
Event contained reference to Instance. In case of lost/found message(m_matching_event=NULL) we weren't able to determine receiver/sender of Event. Instance reference moved to MscMessage.
Modified Paths:
--------------
trunk/src/data/msc.h
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-03-09 13:32:22 UTC (rev 6)
+++ trunk/src/data/msc.h 2008-03-10 20:31:26 UTC (rev 7)
@@ -50,6 +50,8 @@
typedef counted_ptr<EventArea> EventAreaPtr;
typedef std::list<EventAreaPtr> EventAreaPtrList;
+typedef counted_ptr<Instance> InstancePtr;
+
/**
* Represents virtual base class for BMsc and HMsc.
*/
@@ -72,7 +74,7 @@
/**
* Processes' instances which are contained in Bmsc.
*/
- InstancePtrList m_processes;
+ InstancePtrList m_instances;
};
/**
@@ -113,11 +115,11 @@
string m_label;
/**
- * Events which occures at process.
+ * Events which occures at instance.
*
* Events are ordered in list, moreover they have order numbers, see Event.
*/
- EventPtrList m_events;
+ InstanceAreaPtr m_areas;
};
@@ -175,6 +177,22 @@
* Label of message.
*/
string m_label;
+
+ /**
+ * Sender of message.
+ *
+ * The counted_ptr shouldn't be used instead because of
+ * occurence of cyclic references.
+ */
+ Instance* m_sender;
+
+ /**
+ * Receiver of message.
+ *
+ * The counted_ptr shouldn't be used instead because of
+ * occurence of cyclic references.
+ */
+ Instance* m_receiver;
};
/**
@@ -191,16 +209,11 @@
/**
* Label of message whose this is send or receive event.
*/
- string m_message;
+ MscMessagePtr m_message;
/**
- * Instance that this event occures at.
+ * Opposite (send/receive) event of this event.
*/
- InstancePtr m_process;
-
- /**
- * Oposite (send/receive) event of this event.
- */
EventPtr m_matching_event;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <koc...@us...> - 2008-04-09 00:08:03
|
Revision: 19
http://scstudio.svn.sourceforge.net/scstudio/?rev=19&view=rev
Author: kocianon
Date: 2008-04-08 17:08:00 -0700 (Tue, 08 Apr 2008)
Log Message:
-----------
get and set
Modified Paths:
--------------
trunk/src/data/msc.h
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-04-08 22:27:26 UTC (rev 18)
+++ trunk/src/data/msc.h 2008-04-09 00:08:00 UTC (rev 19)
@@ -108,7 +108,7 @@
*/
class HMsc:public Msc
{
-
+ private:
/**
* Start node of HMsc.
*
@@ -120,6 +120,10 @@
* All ReferenceNodes of HMsc.
*/
ReferenceNodePtrList m_nodes;
+
+ public:
+ inline StartNodePtr getStart() { return m_start; }
+ inline ReferenceNodePtrList getNodes() { return m_nodes; }
};
/**
@@ -137,12 +141,13 @@
*/
class StartNode:public HMscNode
{
-
+ private:
/**
* Succesors of StartNode.
*/
ReferenceNodePtrList m_successors;
-
+ public:
+ inline ReferenceNodePtrList getSuccessors() { return m_successors; }
};
/**
@@ -159,7 +164,7 @@
*/
class ReferenceNode:public HMscNode
{
-
+ private:
/**
* Succesors of ReferenceNode.
*/
@@ -175,6 +180,11 @@
* NULL if there isn't any such connection.
*/
EndNodePtr m_end;
+
+ public:
+ inline ReferenceNodePtrList getSuccessors() { return m_successors; }
+ inline EndNodePtr getEnd() { return m_end; }
+
};
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ba...@us...> - 2008-04-09 10:50:47
|
Revision: 21
http://scstudio.svn.sourceforge.net/scstudio/?rev=21&view=rev
Author: babicaj
Date: 2008-04-09 03:50:42 -0700 (Wed, 09 Apr 2008)
Log Message:
-----------
Comments augmented.
Modified Paths:
--------------
trunk/src/data/msc.h
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-04-09 00:41:32 UTC (rev 20)
+++ trunk/src/data/msc.h 2008-04-09 10:50:42 UTC (rev 21)
@@ -296,7 +296,8 @@
MscMessagePtr m_message;
/**
- * Opposite (send/receive) event of this event.
+ * Opposite (send/receive) event of this event. Undefined in case of lost or
+ * found message.
*/
EventPtr m_matching_event;
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ba...@us...> - 2008-04-12 20:04:15
|
Revision: 25
http://scstudio.svn.sourceforge.net/scstudio/?rev=25&view=rev
Author: babicaj
Date: 2008-04-12 13:04:08 -0700 (Sat, 12 Apr 2008)
Log Message:
-----------
Mechanism for dynamic attributes of MscElements - useful for checking algorithms
Modified Paths:
--------------
trunk/src/data/msc.h
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-04-11 20:00:19 UTC (rev 24)
+++ trunk/src/data/msc.h 2008-04-12 20:04:08 UTC (rev 25)
@@ -22,6 +22,7 @@
#include <list>
#include <string>
#include <set>
+#include <map>
#include "counted_ptr.h"
@@ -78,16 +79,91 @@
typedef counted_ptr<CoregionArea> CoregionAreaPtr;
+typedef void* AttributePtr;
+typedef std::map<std::string,AttributePtr> AttributePtrMap;
+
/**
+ * Common basic abstract class for all elements of MSC
+ */
+class MscElement
+{
+ /**
+ * Atributes of MscElement which may be dynamically created.
+ *
+ * It is neccessary to ensure to remove any attribute if the attribute is no
+ * more required.
+ *
+ * @warning individual attributes are of type AttributePtr, i.e. type control
+ * is left up to piece of code using these attributes
+ */
+ AttributePtrMap m_attributes;
+
+protected:
+
+ /**
+ * Abstract class should be able to be instantiated.
+ */
+ MscElement(){}
+
+public:
+
+ /**
+ * Returns pointer to dynamic attribute identified by name.
+ */
+ inline AttributePtr getAttribute(std::string& name)
+ {
+ return m_attributes[name];
+ }
+
+ /**
+ * Returns pointer to dynamic attribute identified by name.
+ *
+ * If there isn't such attribute then it is set by default to value and
+ * returns this one.
+ */
+ AttributePtr getAttribute(std::string& name, AttributePtr value)
+ {
+ return (*(m_attributes.insert(
+ std::pair<std::string,AttributePtr>(name,value)).first)).second;
+ }
+
+ /**
+ * Sets dynamic attribute.
+ * @param name - name of attribute
+ * @param value - value of attribute
+ */
+ void setAttribute(std::string& name, AttributePtr value){
+ m_attributes[name]=value;
+ }
+
+ /**
+ * Finds out whether attribute with specified name is set or not.
+ * @param name - name of attribute
+ * @returns true if attribute is set false otherwise
+ */
+ bool isAttributeSet(std::string& name){
+ return (m_attributes.find(name)!=m_attributes.end());
+ }
+
+};
+
+/**
* Represents virtual base class for BMsc and HMsc.
*/
-class Msc
+class Msc:public MscElement
{
/**
* Label of MSC.
*/
std::string m_label;
+
+protected:
+
+ /**
+ * This is an abstract class.
+ */
+ Msc(){}
};
@@ -129,8 +205,14 @@
/**
* Base abstract class for node of HMsc
*/
-class HMscNode{
+class HMscNode:public MscElement{
+protected:
+ /**
+ * This is an abstract class
+ */
+ HMscNode(){}
+
};
/**
@@ -141,13 +223,18 @@
*/
class StartNode:public HMscNode
{
- private:
- /**
- * Succesors of StartNode.
- */
- ReferenceNodePtrList m_successors;
- public:
- inline ReferenceNodePtrList getSuccessors() { return m_successors; }
+private:
+ /**
+ * Succesors of StartNode.
+ */
+ ReferenceNodePtrList m_successors;
+
+public:
+
+ /**
+ * Getter for m_successors.
+ */
+ inline ReferenceNodePtrList& getSuccessors() { return m_successors; }
};
/**
@@ -190,7 +277,7 @@
/**
* Represents process (vertical line) in Basic MSC.
*/
-class Instance
+class Instance:public MscElement
{
/**
@@ -210,7 +297,7 @@
/**
* General base area which contains events.
*/
-class EventArea
+class EventArea:public MscElement
{
/**
@@ -246,7 +333,7 @@
/**
* Area of Instance that represents area where Events at this Instance are located.
*/
-class InstanceArea
+class InstanceArea:public MscElement
{
/**
@@ -259,7 +346,7 @@
/**
* Message sent by Instances.
*/
-class MscMessage
+class MscMessage:public MscElement
{
/**
* Label of message.
@@ -286,7 +373,7 @@
/**
* Event which occures in EventArea.
*/
-class Event
+class Event:public MscElement
{
/**
@@ -331,6 +418,14 @@
* Successors of this event
*/
CoregionEventPtrList m_successors;
+
+public:
+ /**
+ * Getter for m_successors
+ */
+ inline CoregionEventPtrList& getSuccessors(){
+ return m_successors;
+ }
};
#endif /* _MSC_H */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ba...@us...> - 2008-04-12 21:29:57
|
Revision: 26
http://scstudio.svn.sourceforge.net/scstudio/?rev=26&view=rev
Author: babicaj
Date: 2008-04-12 14:29:52 -0700 (Sat, 12 Apr 2008)
Log Message:
-----------
const added for some parameters of methods
Modified Paths:
--------------
trunk/src/data/msc.h
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-04-12 20:04:08 UTC (rev 25)
+++ trunk/src/data/msc.h 2008-04-12 21:29:52 UTC (rev 26)
@@ -101,7 +101,7 @@
protected:
/**
- * Abstract class should be able to be instantiated.
+ * Abstract class shouldn't be able to be instantiated.
*/
MscElement(){}
@@ -110,7 +110,7 @@
/**
* Returns pointer to dynamic attribute identified by name.
*/
- inline AttributePtr getAttribute(std::string& name)
+ inline AttributePtr getAttribute(const std::string& name)
{
return m_attributes[name];
}
@@ -121,7 +121,7 @@
* If there isn't such attribute then it is set by default to value and
* returns this one.
*/
- AttributePtr getAttribute(std::string& name, AttributePtr value)
+ AttributePtr getAttribute(const std::string& name, AttributePtr value)
{
return (*(m_attributes.insert(
std::pair<std::string,AttributePtr>(name,value)).first)).second;
@@ -132,7 +132,7 @@
* @param name - name of attribute
* @param value - value of attribute
*/
- void setAttribute(std::string& name, AttributePtr value){
+ void setAttribute(const std::string& name, AttributePtr value){
m_attributes[name]=value;
}
@@ -141,7 +141,7 @@
* @param name - name of attribute
* @returns true if attribute is set false otherwise
*/
- bool isAttributeSet(std::string& name){
+ bool isAttributeSet(const std::string& name){
return (m_attributes.find(name)!=m_attributes.end());
}
@@ -199,7 +199,7 @@
public:
inline StartNodePtr getStart() { return m_start; }
- inline ReferenceNodePtrList getNodes() { return m_nodes; }
+ inline ReferenceNodePtrList& getNodes() { return m_nodes; }
};
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-04-14 09:59:31
|
Revision: 27
http://scstudio.svn.sourceforge.net/scstudio/?rev=27&view=rev
Author: madzin
Date: 2008-04-14 02:27:27 -0700 (Mon, 14 Apr 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/src/data/msc.h
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-04-12 21:29:52 UTC (rev 26)
+++ trunk/src/data/msc.h 2008-04-14 09:27:27 UTC (rev 27)
@@ -328,6 +328,10 @@
* Events which aren't successors of any other events.
*/
CoregionEventPtrList m_minimal_events;
+
+ public:
+ inline GeneralEventPtrList getMinimal_events() { return m_minimal_events; }
+
};
/**
@@ -426,6 +430,10 @@
inline CoregionEventPtrList& getSuccessors(){
return m_successors;
}
+
+ public:
+ inline GeneralEventPtrList getSuccessors() { return m_successors; }
+
};
#endif /* _MSC_H */
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ba...@us...> - 2008-04-15 19:34:20
|
Revision: 32
http://scstudio.svn.sourceforge.net/scstudio/?rev=32&view=rev
Author: babicaj
Date: 2008-04-15 12:34:13 -0700 (Tue, 15 Apr 2008)
Log Message:
-----------
New getter methods
Modified Paths:
--------------
trunk/src/data/msc.h
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-04-15 19:30:03 UTC (rev 31)
+++ trunk/src/data/msc.h 2008-04-15 19:34:13 UTC (rev 32)
@@ -372,6 +372,23 @@
* occurence of cyclic references.
*/
Instance* m_receiver;
+
+public:
+
+ /**
+ * Getter for m_sender.
+ */
+ Instance* getSender() const {return m_sender;}
+
+ /**
+ * Getter for m_receiver.
+ */
+ Instance* getReceiver() const {return m_receiver;}
+
+ /**
+ * Getter for m_label.
+ */
+ const std::string& getLabel() const {return m_label;}
};
/**
@@ -400,6 +417,13 @@
* EventArea which this Event occures in.
*/
EventArea* m_area;
+
+public:
+
+ /**
+ * Getter for m_message.
+ */
+ MscMessagePtr getMessage(){ return m_message;}
};
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ba...@us...> - 2008-04-19 09:17:02
|
Revision: 37
http://scstudio.svn.sourceforge.net/scstudio/?rev=37&view=rev
Author: babicaj
Date: 2008-04-19 02:16:58 -0700 (Sat, 19 Apr 2008)
Log Message:
-----------
New setters and getters methods of elements
Modified Paths:
--------------
trunk/src/data/msc.h
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-04-17 20:57:49 UTC (rev 36)
+++ trunk/src/data/msc.h 2008-04-19 09:16:58 UTC (rev 37)
@@ -105,6 +105,23 @@
* Abstract class shouldn't be able to be instantiated.
*/
MscElement(){}
+
+ /**
+ * Pointer to original version of MscElement.
+ *
+ * Checking algorithms returns as their result violating example of BMsc or
+ * path in HMsc. To show exact violating example they must often change the
+ * original version of BMsc or HMsc. However, it is neccessary to keep
+ * original unmodified version, therefore they must create copy of the
+ * structure that violated some property.
+ *
+ * Moreover it is neccessary to keep relationship between original MscElement
+ * and the newly created one. Therefore algorithms keep this relation in this
+ * attribute.
+ *
+ * This should be set only if new version of element differs form the old one.
+ */
+ MscElementPtr m_original;
public:
@@ -138,7 +155,22 @@
bool isAttributeSet(const std::string& name){
return (m_attributes.find(name)!=m_attributes.end());
}
-
+
+ /**
+ * Getter for m_original.
+ */
+ MscElementPtr getOriginal()
+ {
+ return m_original;
+ }
+
+ /**
+ * Setter for m_original.
+ */
+ void setOriginal(MscElementPtr e)
+ {
+ m_original = e;
+ }
};
/**
@@ -296,13 +328,21 @@
public:
- /**
- * Getter for m_first.
- */
- EventAreaPtr getFirst()
- {
- return m_first;
- }
+ /**
+ * Getter for m_first.
+ */
+ EventAreaPtr getFirst()
+ {
+ return m_first;
+ }
+
+ /**
+ * Getter for m_label.
+ */
+ const std::string& getLabel()
+ {
+ return m_label;
+ }
};
@@ -447,6 +487,14 @@
* Getter for m_message.
*/
MscMessagePtr getMessage(){ return m_message;}
+
+ /**
+ * Getter for m_matching_event.
+ */
+ EventPtr getMatchingEvent()
+ {
+ return m_matching_event;
+ }
};
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-04-21 23:52:31
|
Revision: 40
http://scstudio.svn.sourceforge.net/scstudio/?rev=40&view=rev
Author: madzin
Date: 2008-04-21 16:52:27 -0700 (Mon, 21 Apr 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/src/data/msc.h
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-04-21 23:51:40 UTC (rev 39)
+++ trunk/src/data/msc.h 2008-04-21 23:52:27 UTC (rev 40)
@@ -311,6 +311,7 @@
public:
inline ReferenceNodePtrList getSuccessors() { return m_successors; }
inline EndNodePtr getEnd() { return m_end; }
+ inline MscPtr getMsc() { return m_msc; }
};
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <koc...@us...> - 2008-05-09 13:02:26
|
Revision: 61
http://scstudio.svn.sourceforge.net/scstudio/?rev=61&view=rev
Author: kocianon
Date: 2008-05-09 06:01:57 -0700 (Fri, 09 May 2008)
Log Message:
-----------
add metod ReferenceNode::get_predecessors()
Modified Paths:
--------------
trunk/src/data/msc.h
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-05-08 16:33:34 UTC (rev 60)
+++ trunk/src/data/msc.h 2008-05-09 13:01:57 UTC (rev 61)
@@ -13,7 +13,7 @@
*
* Copyright (c) 2008 Jindra Babica <ba...@ma...>
*
- * $Id$
+ * $Id: $
*/
#ifndef _MSC_H
@@ -378,10 +378,10 @@
{
private:
- /**
- * Succesors of ReferenceNode.
- */
- ReferenceNodePSet m_successors;
+ /**
+ * Succesors of ReferenceNode.
+ */
+ ReferenceNodePSet m_successors;
/**
* Predecessors of this ReferenceNode.
@@ -432,6 +432,15 @@
}
/**
+ * Getter for m_predecessor
+ */
+ const ReferenceNodePSet& get_predecessors()
+ {
+ return m_predecessors;
+ }
+
+
+ /**
* Getter for m_end.
*/
EndNodePtr get_end()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-05-10 20:17:10
|
Revision: 67
http://scstudio.svn.sourceforge.net/scstudio/?rev=67&view=rev
Author: madzin
Date: 2008-05-10 13:17:03 -0700 (Sat, 10 May 2008)
Log Message:
-----------
I wrote set and get methods to work with BMCS and components of BMCS.
Modified Paths:
--------------
trunk/src/data/msc.h
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-05-10 19:11:50 UTC (rev 66)
+++ trunk/src/data/msc.h 2008-05-10 20:17:03 UTC (rev 67)
@@ -267,8 +267,16 @@
{
}
-
+
/**
+ *Adds instance.
+ */
+ void add_instance(InstancePtr& i)
+ {
+ m_instances.push_back(i);
+ }
+
+ /**
* Getter for m_instances.
*/
const InstancePtrList& get_instances()
@@ -529,7 +537,18 @@
public:
+ Instance()
+ {
+ }
+
/**
+ * Set the first EventArea
+ */
+ void set_first(EventAreaPtr& a)
+ {
+ m_first = a;
+ }
+ /**
* Getter for m_first.
*/
EventAreaPtr get_first()
@@ -877,6 +896,14 @@
virtual ~EventArea(){}
/**
+ * Set event's successor
+ */
+ void set_next(EventAreaPtr& n){
+ m_next = n;
+ n->m_previous = this;
+ }
+
+ /**
* Getter for m_next
*/
EventAreaPtr get_next()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-05-12 12:58:03
|
Revision: 71
http://scstudio.svn.sourceforge.net/scstudio/?rev=71&view=rev
Author: madzin
Date: 2008-05-12 05:57:56 -0700 (Mon, 12 May 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/src/data/msc.h
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-05-12 12:41:44 UTC (rev 70)
+++ trunk/src/data/msc.h 2008-05-12 12:57:56 UTC (rev 71)
@@ -544,7 +544,7 @@
/**
* Set the first EventArea
*/
- void set_first(EventAreaPtr& a)
+ void set_first(EventAreaPtr a)
{
m_first = a;
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-05-17 19:59:17
|
Revision: 81
http://scstudio.svn.sourceforge.net/scstudio/?rev=81&view=rev
Author: madzin
Date: 2008-05-17 12:59:11 -0700 (Sat, 17 May 2008)
Log Message:
-----------
new constructor
Modified Paths:
--------------
trunk/src/data/msc.h
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-05-15 19:01:23 UTC (rev 80)
+++ trunk/src/data/msc.h 2008-05-17 19:59:11 UTC (rev 81)
@@ -583,8 +583,9 @@
public:
- Instance()
+ Instance(BMsc* msc)
{
+ m_bmsc = msc;
}
virtual ~Instance()
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <ma...@us...> - 2008-05-19 15:59:25
|
Revision: 87
http://scstudio.svn.sourceforge.net/scstudio/?rev=87&view=rev
Author: madzin
Date: 2008-05-19 08:59:09 -0700 (Mon, 19 May 2008)
Log Message:
-----------
Modified Paths:
--------------
trunk/src/data/msc.h
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-05-19 15:58:33 UTC (rev 86)
+++ trunk/src/data/msc.h 2008-05-19 15:59:09 UTC (rev 87)
@@ -866,6 +866,11 @@
}
+ StrictEvent(StrictOrderArea* area, Event* event):Event((EventArea*)area,event)
+ {
+
+ }
+
virtual ~StrictEvent()
{
@@ -940,10 +945,24 @@
public:
/**
+ * Constructor
+ */
+ CoregionEvent(CoregionArea* area, MscMessagePtr message):Event((EventArea*)area, message)
+ {
+
+ }
+
+ CoregionEvent(CoregionArea* area, Event* event):Event((EventArea*)area,event)
+ {
+ }
+
+ /**
* Sets m_area to area
*/
CoregionEvent(CoregionArea* area);
+
+
virtual ~CoregionEvent();
/**
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <koc...@us...> - 2008-05-10 15:36:36
|
Revision: 65
http://scstudio.svn.sourceforge.net/scstudio/?rev=65&view=rev
Author: kocianon
Date: 2008-05-10 08:36:31 -0700 (Sat, 10 May 2008)
Log Message:
-----------
getting metods
Modified Paths:
--------------
trunk/src/data/msc.h
Modified: trunk/src/data/msc.h
===================================================================
--- trunk/src/data/msc.h 2008-05-09 18:20:13 UTC (rev 64)
+++ trunk/src/data/msc.h 2008-05-10 15:36:31 UTC (rev 65)
@@ -243,6 +243,10 @@
virtual ~Msc()
{
}
+
+ void set_label(const std::string label) { m_label = label; }
+
+ const std::string& get_label() { return m_label; }
};
@@ -277,12 +281,17 @@
* Base abstract class for node of HMsc
*/
class HMscNode:public MscElement{
+ std::string m_label;
protected:
/**
* This is an abstract class
*/
HMscNode(){}
+public:
+
+ void set_label(const std::string label) { m_label = label; }
+ const std::string& get_label() { return m_label; }
};
@@ -313,7 +322,6 @@
StartNode()
{
-
}
/**
@@ -347,18 +355,19 @@
class HMsc:public Msc
{
private:
- /**
- * Start node of HMsc.
+ /**
+ * Start node of HMsc.
*
* Mandatory element in HMsc, should be initialized in constructor.
- */
- StartNodePtr m_start;
+ */
+ StartNodePtr m_start;
public:
HMsc()
{
- m_start = StartNodePtr(new StartNode());
+ StartNodePtr start(new StartNode);
+ m_start = start;
}
/**
@@ -448,6 +457,12 @@
return m_end;
}
+ EndNodePtr set_end()
+ {
+ EndNodePtr end(new EndNode);
+ return m_end = end;
+ }
+
/**
* Getter for m_msc.
*/
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
Thanks for helping keep SourceForge clean.
X