CtxAutTransition(s), renaming

ctx_aut.cc

@@ -86,7 +86,7 @@ void CtxAut::addTransition(std::string srcStateName, std::string dstStateName)
 {
     VERB_L3("Saving transition");
 	
-	Transition new_transition;
+	CtxAutTransition new_transition;
 	
 	new_transition.src_state = getStateID(srcStateName);
 	new_transition.ctx = tmpEntities; 

ctx_aut.hh

@@ -51,7 +51,7 @@ class CtxAut
 		State init_state_id;
 		bool init_state_defined;
 		Entities tmpEntities;
-		Transitions transitions;
+		CtxAutTransitions transitions;
 };
 
 #endif /* RS_CTX_AUT_HH */

symrs.hh

@@ -148,6 +148,7 @@ public:
     BDD encEntity(std::string name) const {
         return encEntity(rs->getEntityID(name));
     }
+	
     BDD encActStrEntity(std::string name) const;
     BDD getBDDtrue(void) const { return BDD_TRUE; }
     BDD getBDDfalse(void) const { return BDD_FALSE; }

types.hh

@@ -39,12 +39,12 @@ typedef std::vector<ReactionCond> ReactionConds;
 typedef std::map<Entity,ReactionConds> DecompReactions;
 typedef std::vector<int> StateEntityToAction;
 
-struct Transition {
+struct CtxAutTransition {
 	State src_state;
 	Entities ctx;
 	State dst_state;
 };
 
-typedef std::vector<Transition> Transitions;
+typedef std::vector<CtxAutTransition> CtxAutTransitions;
 
 #endif