3.0.5 version (2)

terna · Sep 6, 2017 · 22b6a4c · 22b6a4c
1 parent 09403cf
commit 22b6a4c
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 1 deletion.
diff --git a/6 objectSwarmObserverAgents_AESOP_turtleLib_NetworkX/$$slapp$$/ModelSwarm.py b/6 objectSwarmObserverAgents_AESOP_turtleLib_NetworkX/$$slapp$$/ModelSwarm.py
@@ -498,6 +498,9 @@ def applyFromSchedule(self, localList, task):
                 else:
                     try:
                         exec("askEachAgentInCollection(localList,task[2])")
+                    except SystemExit:
+                        print('method', task[2],'raising an exit condition')
+                        os.sys.exit(1)
                     except BaseException:
                         print("Warning, method", task[2], "does not exist")
             else:
@@ -507,6 +510,9 @@ def applyFromSchedule(self, localList, task):
                 else:
                     try:
                         exec("askEachAgentInCollection(localList,task[1])")
+                    except SystemExit:
+                        print('method', task[1],'raising an exit condition')
+                        os.sys.exit(1)
                     except BaseException:
                         print("Warning, method", task[1], "does not exist")
 
@@ -519,6 +525,9 @@ def applyFromSchedule(self, localList, task):
                 else:
                     try:
                         exec("askEachAgentInCollection(localList,task[2])")
+                    except SystemExit:
+                        print('method', task[2],'raising an exit condition')
+                        os.sys.exit(1)
                     except BaseException:
                         print("Warning, method", task[2], "does not exist")
             else:
@@ -528,6 +537,9 @@ def applyFromSchedule(self, localList, task):
                 else:
                     try:
                         exec("askEachAgentInCollection(localList,task[1])")
+                    except SystemExit:
+                        print('method', task[1],'raising an exit condition')
+                        os.sys.exit(1)
                     except BaseException:
                         print("Warning, method", task[1], "does not exist")
 

diff --git a/6 objectSwarmObserverAgents_AESOP_turtleLib_NetworkX/start.py b/6 objectSwarmObserverAgents_AESOP_turtleLib_NetworkX/start.py
@@ -12,7 +12,7 @@
 
 def runSLAPP():
     global start_pyDir
-    print("\nSLAPP v3.0.5 build 20170905\n")
+    print("\nSLAPP v3.0.5 build 20170906\n")
     import os
 
     confirm = "n"

diff --git a/HISTORY.md b/HISTORY.md
@@ -326,3 +326,5 @@ under execution (if debug==False)
 
 fixed duplicating the *except* condition, with *except SystemExit* in first
 position to repeat the *os.sys.exit(1)* action
+
+the same in ModelSwarm.py when applying methods via the functions of Tools.py