Replace string argument by logical argument

Analysis/make_graph_from_Matlab_HDF5.py

@@ -11,7 +11,7 @@ import h5py
 import datetime
 import csv
 
-def convert_id(orientation, eddy_index_Matlab):
+def convert_id(cyclone, eddy_index_Matlab):
     """Convert from Matlab eddy identification to eddy
     identification in shapefiles.
 
@@ -28,24 +28,24 @@ def convert_id(orientation, eddy_index_Matlab):
     date = datetime.date.fromordinal(date_num - 366) - datetime.date(1950,1,1)
     date = date.days
     
-    if orientation == "anticyclone":
-        eddy_index_F = eddy_index_Matlab - k * n_max
-    else:
+    if cyclone:
         eddy_index_F = Nanti[k] + eddy_index_Matlab - k * n_max
+    else:
+        eddy_index_F = eddy_index_Matlab - k * n_max
 
     return date, eddy_index_F
 
-def print_edgelist(orientation, file, id_child):
+def print_edgelist(file, id_child, cyclone):
     for i1, id_child_1 in enumerate(id_child):
         if file[id_child_1].ndim == 2:
             assert file[id_child_1].shape[1] == 1
-            predecessor = (orientation, k1 * n_max + 1 + i1)
+            predecessor = (cyclone, k1 * n_max + 1 + i1)
             # file[id_child_1][:, 0] is a numpy array of successors.
 
             for eddy_index_Matlab in file[id_child_1][:, 0]:
                 eddy_index_Matlab = int(eddy_index_Matlab)
                 writer.writerow(convert_id(*predecessor)
-                                + convert_id(orientation, eddy_index_Matlab))
+                                + convert_id(cyclone, eddy_index_Matlab))
 
 Assoc_eddies_Anti_max = h5py.File("Association_eddies_Anti_max.mat", "r")
 Assoc_eddies_Cyclo_max = h5py.File("Association_eddies_Cyclo_max.mat", "r")
@@ -68,7 +68,9 @@ with open("edgelist.csv", "w", newline = '') as edgelist:
     writer.writerow(["k1", "i1", "k2", "i2"])
 
     for k1 in range(n_dates):
-        print_edgelist("anticyclone", Assoc_eddies_Anti_max, 
-                       Assoc_eddies_Anti_max["id_child"][k1, :Nanti[k1]])
-        print_edgelist("cyclone", Assoc_eddies_Cyclo_max,
-                       Assoc_eddies_Cyclo_max["id_child"][k1, :Ncyclo[k1]])
+        print_edgelist(Assoc_eddies_Anti_max, 
+                       Assoc_eddies_Anti_max["id_child"][k1, :Nanti[k1]],
+                       cyclone = False)
+        print_edgelist(Assoc_eddies_Cyclo_max,
+                       Assoc_eddies_Cyclo_max["id_child"][k1, :Ncyclo[k1]],
+                       cyclone = True)