piegy 1.1.6__py3-none-any.whl → 2.0.0__py3-none-any.whl

piegy/__version__.py

@@ -21,4 +21,5 @@ version history:
 1.1.5: update README.
 1.1.6: change name of variables in model class -- for compatability with the new C core. 1.1.6 is the last verion of v1. From v2 on, the piegy package has C core.
 
+2.0.0: update simulation core to C-based.
 '''

piegy/data_tools.py

@@ -38,24 +38,19 @@ def save_data(mod, dirs = '', print_msg = True):
         
     data = []
     
-    inputs1 = []
-    inputs1.append(mod.N)
-    inputs1.append(mod.M)
-    inputs1.append(mod.maxtime)
-    inputs1.append(mod.record_itv)
-    inputs1.append(mod.sim_time)
-    inputs1.append(mod.boundary)
-    inputs1.append(mod.I.tolist())
-    inputs1.append(mod.X.tolist())
-    inputs1.append(mod.P.tolist())
-    data.append(inputs1)
-
-    inputs2 = []
-    inputs2.append(mod.print_pct)
-    inputs2.append(mod.seed)
-    inputs2.append(mod.UV_dtype)
-    inputs2.append(mod.pi_dtype)
-    data.append(inputs2)
+    inputs = []
+    inputs.append(mod.N)
+    inputs.append(mod.M)
+    inputs.append(mod.maxtime)
+    inputs.append(mod.record_itv)
+    inputs.append(mod.sim_time)
+    inputs.append(mod.boundary)
+    inputs.append(mod.I.tolist())
+    inputs.append(mod.X.tolist())
+    inputs.append(mod.P.tolist())
+    inputs.append(mod.print_pct)
+    inputs.append(mod.seed)
+    data.append(inputs)
 
     # skipped rng
     
@@ -112,14 +107,14 @@ def read_data(dirs):
     try:
         mod = simulation.model(N = data[0][0], M = data[0][1], maxtime = data[0][2], record_itv = data[0][3],
                             sim_time = data[0][4], boundary = data[0][5], I = data[0][6], X = data[0][7], P = data[0][8], 
-                            print_pct = data[1][0], seed = data[1][1], UV_dtype = data[1][2], pi_dtype = data[1][3])
+                            print_pct = data[0][9], seed = data[0][10])
     except:
         raise ValueError('Invalid input parameters saved in data')
 
     # outputs
     try:
-        mod.set_data(data_empty = False, max_record = data[2][0], compress_itv = data[2][1], 
-                    U = data[2][2], V = data[2][3], Upi = data[2][4], Vpi = data[2][5])
+        mod.set_data(data_empty = False, max_record = data[1][0], compress_itv = data[1][1], 
+                    U = data[1][2], V = data[1][3], Upi = data[1][4], Vpi = data[1][5])
     except:
         raise ValueError('Invalid model results saved in data')