Types

symrs.cc

@@ -1,9 +1,6 @@
 /*
-    Copyright (c) 2012-2014
+    Copyright (c) 2012-2018
     Artur Meski <meski@ipipan.waw.pl>
-
-    Reuse of the code or its part for any purpose
-    without the author's permission is strictly prohibited.
 */
 
 #include "symrs.hh"
@@ -210,7 +207,7 @@ void SymRS::encodeTransitions(void)
 
         if ((di = dr.find(p)) == dr.end())
         {
-            // nie ma reakcji produkujacej p:
+            // there is no reaction producing p:
             if (opts->part_tr_rel)
                 (*partTrans)[p] = !encEntitySucc(p);
             else
@@ -220,7 +217,7 @@ void SymRS::encodeTransitions(void)
         }
         else
         {
-            // di - reakcje produkujace p
+            // di - reactions producing p
             
             BDD conditions = BDD_FALSE;
 

symrs.hh

@@ -36,14 +36,6 @@ class SymRS
     Cudd *cuddMgr;
     Options *opts;
 
-    struct ReactionCond {
-        Entities rctt;
-        Entities inhib;
-    };
-    typedef vector<ReactionCond> ReactionConds;
-    typedef map<Entity,ReactionConds> DecompReactions;
-    typedef std::vector<int> StateEntityToAction; 
-
     StateEntityToAction stateToAct;
 
     BDD *initStates;

types.hh

@@ -30,6 +30,15 @@ typedef unsigned int State;
 typedef std::vector<std::string> StatesById;
 typedef std::map<std::string, State> StatesByName;
 
+struct ReactionCond {
+    Entities rctt;
+    Entities inhib;
+};
+
+typedef std::vector<ReactionCond> ReactionConds;
+typedef std::map<Entity,ReactionConds> DecompReactions;
+typedef std::vector<int> StateEntityToAction;
+
 struct Transition {
 	State src_state;
 	Entities ctx;