From ee441ab390aa3ac5820c16c2709d13dce70c4ca8 Mon Sep 17 00:00:00 2001
From: Artur Meski <artur.meski@gmail.com>
Date: Mon, 26 Mar 2018 11:00:23 +0100
Subject: [PATCH] Types

---
 symrs.cc | 9 +++------
 symrs.hh | 8 --------
 types.hh | 9 +++++++++
 3 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/symrs.cc b/symrs.cc
index e4c03e9..fb6d4e5 100644
--- a/symrs.cc
+++ b/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;
 
diff --git a/symrs.hh b/symrs.hh
index 3898896..08fd346 100644
--- a/symrs.hh
+++ b/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;
diff --git a/types.hh b/types.hh
index 87b0e86..0e8a79e 100644
--- a/types.hh
+++ b/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;