Fixing recursion in integration variable and going back to using dill…

… for dump files

requirements.txt

@@ -1,3 +1,4 @@
+dill
 h5py
 matplotlib
 numpy

setup.py

@@ -52,7 +52,7 @@ def read_version():
                  ],
 
     packages=find_packages(),
-    install_requires=["h5py", "matplotlib", "numpy", "scipy"],
+    install_requires=["dill", "h5py", "matplotlib", "numpy", "scipy"],
     include_package_data=True,
     zip_safe=False,
 )

simframe/integration/integrator.py

@@ -140,7 +140,7 @@ def integrate(self):
         # And count the loops
         i = 0
         status = False
-        while(not status):
+        while (not status):
             # The suggested stepsize has to be reset in the beginning of every try.
             # We therefore have to copy the current stepsize in case the user is returning
             # the suggested stepsize in the stepsize function.
@@ -169,7 +169,7 @@ def integrate(self):
                 continue
             upd(None, inst.Y, None)
         # Store the taken stepsize
-        self.var._prevstepsize = stepsize
+        self.var._prevstepsize = np.array(stepsize)
         # Finalization
         self._finalize()
 

simframe/io/dump.py

@@ -1,4 +1,4 @@
-import pickle
+import dill
 
 
 def writedump(object, filename="object.dmp"):
@@ -11,7 +11,7 @@ def writedump(object, filename="object.dmp"):
     filename : str, optional, default : "object.dmp"
         path to file to be written"""
     with open(filename, "wb") as dumpfile:
-        pickle.dump(object, dumpfile)
+        dill.dump(object, dumpfile)
 
 
 def readdump(filename):
@@ -32,5 +32,5 @@ def readdump(filename):
     Only read dump files from sources you trust.
     Malware can be injected."""
     with open(filename, "rb") as dumpfile:
-        obj = pickle.load(dumpfile)
+        obj = dill.load(dumpfile)
     return obj