From b2fa911a77b38117f95eb205dbd7a627b648048d Mon Sep 17 00:00:00 2001
From: Artur Meski <artur.meski@gmail.com>
Date: Wed, 28 Dec 2016 16:16:24 +0100
Subject: [PATCH] cleanup

---
 rs_testing.py | 61 +++++++++++++++++++++++++++++++++++++++++++++++++++
 rssmt.py      | 51 +++---------------------------------------
 2 files changed, 64 insertions(+), 48 deletions(-)
 create mode 100644 rs_testing.py

diff --git a/rs_testing.py b/rs_testing.py
new file mode 100644
index 0000000..d1706d1
--- /dev/null
+++ b/rs_testing.py
@@ -0,0 +1,61 @@
+from rs import *
+from smt import *
+
+def run_tests():
+    
+    test_extended_automaton()
+    # process()
+
+def test_extended_automaton():
+    
+    r = ReactionSystem()
+    r.add_bg_set_entity("inc")
+    r.add_bg_set_entity("dec")
+
+    c = ExtendedContextAutomaton(r)
+    c.add_init_state("init")
+    c.add_state("working")
+    c.add_action("act1")
+    c.add_action("act2")
+    c.add_transition("init", "act1", ([],[],["inc"]), "working")
+    c.add_transition("working", "act2", ([],[],["inc"]), "working")
+
+    rc = ReactionSystemWithAutomaton(r,c)
+
+    rc.show()
+
+def process():
+    
+    # rs_examples.run_counter_exp()
+    rs_examples.chain_reaction(print_system=True)
+    # rs_examples.heat_shock_response()
+    
+    
+
+# PGRS:
+# rsca = rs_examples.ca_toy_ex1()
+# rsca.show()
+# smt = SmtCheckerPGRS(rsca)
+# smt.check_reachability(rs_examples.ca_toy_ex1_property1(), print_time=True)
+
+# rsca = rs_examples.ca_bitctr(N)
+# rsca.show(True)
+# smt = SmtCheckerPGRS(rsca)
+# smt.check_reachability(rs_examples.ca_bitctr_property(N), print_time=True)
+
+# Distributed RS:
+#drs = rs_examples.drs_mutex(N)
+#drs.show()
+
+#smt = SmtCheckerDistribRS(drs,debug_level=0)
+#smt.check_reachability(rs_examples.drs_mutex_property1(N),
+#    exclusive_state=False,
+#    max_level=10,
+#    print_time=True,
+#    print_mem=True)
+
+# drs = rs_examples.drs_toy_ex1()
+# drs.show()
+#
+# smt = SmtCheckerDistribRS(drs,debug_level=3)
+# smt.check_reachability(rs_examples.drs_toy_ex1_property1(),max_level=10,print_time=True)
diff --git a/rssmt.py b/rssmt.py
index 996beb6..d638a0a 100755
--- a/rssmt.py
+++ b/rssmt.py
@@ -10,6 +10,7 @@ from rs import *
 from smt import *
 import sys
 import rs_examples
+import rs_testing
 
 from colour import *
 
@@ -29,34 +30,14 @@ def print_banner():
         print(colour_str(C_GREEN, " " + 3*"-" + " "), line)
     print()
 
-def process():
-    
-    # rs_examples.run_counter_exp()
-    rs_examples.chain_reaction(print_system=True)
-    # rs_examples.heat_shock_response()
-
 ##################################################################    
 
 def main():
     
     print_banner()
-
-    # process()
-    r = ReactionSystem()
-    r.add_bg_set_entity("inc")
-    r.add_bg_set_entity("dec")
     
-    c = ExtendedContextAutomaton(r)
-    c.add_init_state("init")
-    c.add_state("working")
-    c.add_action("act1")
-    c.add_action("act2")
-    c.add_transition("init", "act1", ([],[],["inc"]), "working")
-    c.add_transition("working", "act2", ([],[],["inc"]), "working")
+    rs_testing.run_tests()
     
-    rc = ReactionSystemWithAutomaton(r,c)
-
-    rc.show()
     
 if __name__ == "__main__":
     try:
@@ -69,30 +50,4 @@ if __name__ == "__main__":
         print("\nQuitting...")
         sys.exit(99)
 
-# PGRS:
-# rsca = rs_examples.ca_toy_ex1()
-# rsca.show()
-# smt = SmtCheckerPGRS(rsca)
-# smt.check_reachability(rs_examples.ca_toy_ex1_property1(), print_time=True)
-
-# rsca = rs_examples.ca_bitctr(N)
-# rsca.show(True)
-# smt = SmtCheckerPGRS(rsca)
-# smt.check_reachability(rs_examples.ca_bitctr_property(N), print_time=True)
-
-# Distributed RS:
-#drs = rs_examples.drs_mutex(N)
-#drs.show()
-
-#smt = SmtCheckerDistribRS(drs,debug_level=0)
-#smt.check_reachability(rs_examples.drs_mutex_property1(N),
-#    exclusive_state=False,
-#    max_level=10,
-#    print_time=True,
-#    print_mem=True)
-
-# drs = rs_examples.drs_toy_ex1()
-# drs.show()
-#
-# smt = SmtCheckerDistribRS(drs,debug_level=3)
-# smt.check_reachability(rs_examples.drs_toy_ex1_property1(),max_level=10,print_time=True)
+# EOF