Merge branch 'master' of https://github.com/chathika/nl4py into master

Author: chathika

bin/NetLogo6.0/NetLogoControllerServer.jar

@@ -30,4 +30,5 @@ v0.5.10, 17th February 2020 -- awaitScheduledReporterResults fix: fixed bug that
 v0.5.11, 21st April 2020 -- Mac OS library misindentification fix and accommodation for levelspace extension
 v0.7.0, 04th October 2020 -- PEP compliance for API, run_experiment
 v0.8.0, 13th April 2020 -- API fixes; run_experiment return pandas dataframe
-v0.8.1, 2nd June 2021 -- Safe conversion of reporter results into Python objects when non-eval'uable objects are returned.
+v0.8.1, 2nd June 2021 -- Safe conversion of reporter results into Python objects when non-eval'uable objects are returned.
+v0.9.0, 8th June 2021 -- Safe conversion of schedule_reporters results into Python objects when non-eval'uable objects are returned, fix to workspace disposal

bin/NetLogo6.0/nl4py/server/HeadlessWorkspaceController.class

@@ -14,9 +14,7 @@
 You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.'''
 
-import os
-import socket
-from typing import List, Any, Union
+from typing import List, Any, Union, Dict
 
 from py4j.protocol import Py4JNetworkError
 from py4j.java_gateway import JavaGateway, GatewayParameters, is_instance_of
@@ -76,12 +74,7 @@ def report(self, reporter : str) -> str:
         reporter on its HeadlessWorkspace object
         '''
         result = self.hwc.report(reporter.encode()).decode(encoding='UTF-8')
-        # Try to convert result to Python objects
-        try:
-            result = eval(result)
-        except SyntaxError:
-            pass
-        return result
+        return self._normalize(result)
 
     def schedule_reporters(self, reporters : List[str], start_at_tick : int = 0, interval_ticks : int = 1, 
                                         stop_at_tick : int = -1, go_command : str = 'go') -> List[str]:
@@ -92,15 +85,30 @@ def schedule_reporters(self, reporters : List[str], start_at_tick : int = 0, int
         for idx, reporter in enumerate(reporters):
             reporter_array.append(str(reporter).encode())
         ticks_reporters_results = self.hwc.scheduleReportersAndRun(reporter_array,start_at_tick,
-                                                            interval_ticks,stop_at_tick,go_command)
+                                        interval_ticks,stop_at_tick,go_command)
         out_ticks_reporter_results = []
         for reporters_results in ticks_reporters_results:
             out_reporter_results = []
             for result in reporters_results:
-                out_reporter_results.append(result)
+                out_reporter_results.append(self._normalize(result))
             out_ticks_reporter_results.append(out_reporter_results)
         return out_ticks_reporter_results
-
+    
+    def _normalize(self, result : str) -> Union[str, int, float, List, Dict]:
+        '''
+        Tries to normalize result into Python constructs if possible
+        '''
+        try:
+            eval_result = eval(result)
+            t = type(eval_result)
+            if (t == str) or (t == int) or (t == float) or (t == list) or (t == dict):
+                result = eval_result 
+            else:
+                result = str(result)
+        except SyntaxError:
+            pass
+        return float(result)
+    
     def refresh(self):
         '''
         Sends a signal to the server to tell the respective controller to create a
@@ -186,7 +194,7 @@ def deleteWorkspace(self):
         '''
         Kills the Workspace and its controller on the server
         '''
-        self.hwc.removeControllerFromStore()
+        self.hwc.disposeWorkspace()
         self.gateway.close()
 
     @deprecated('Alias left for backward compatibility. Use open_model() since version 1.0.0.')

bin/NetLogo6.1/NetLogoControllerServer.jar

@@ -2,7 +2,7 @@
 
 setup(
     name='NL4Py',
-    version='0.8.1',
+    version='0.9.0',
     author='Chathika Gunaratne',
     author_email='[email protected]',
     packages=['nl4py', 'nl4py.test'],

bin/NetLogo6.1/nl4py/server/HeadlessWorkspaceController.class

@@ -151,7 +151,7 @@ public SearchSpace getParamList(String path) {
 		return ss;
 	}
 
-	protected void disposeWorkspace(){
+	public void disposeWorkspace(){
 		this.closeModel();
 		try{
 			ws.dispose();