Merge remote-tracking branch 'upstream/hotfixes' into release

Author: fit-alessandro-berti

examples/execute_everything.py

@@ -1082,7 +1082,7 @@ def main():
         execute_script(temporal_features)
         execute_script(transform_db_to_ocel)
         execute_script(transform_db_to_xes)
-        execute_script(transform_db_to_ocel_2)
+        #execute_script(transform_db_to_ocel_2)
         execute_script(feature_extraction_ocel)
         execute_script(ocel_validation)
         execute_script(process_tree_frequency_annotation)
@@ -1126,7 +1126,7 @@ def main():
         execute_script(manual_log_generation)
         execute_script(token_replay_imdf)
         execute_script(decisiontree_trivial_example)
-        execute_script(decisiontree_align_example)
+        #execute_script(decisiontree_align_example)
         execute_script(transition_system_test)
         execute_script(heu_miner_test)
         execute_script(dfg_min_ex_log)

pm4py/algo/analysis/woflan/place_invariants/utility.py

@@ -177,14 +177,16 @@ def transform_basis(basis, style=None):
             val = solver.get_prim_obj_from_sol(sol, variant=proposed_solver)
 
             if points is not None:
-                new_vector = np.zeros(len(vector))
+                new_vector = np.zeros(len(vector), dtype=np.float64)
 
                 if style == "weighted":
                     for i in range(len(new_vector)):
-                        new_vector[i] = points[len(set_B)] * vector[i]
+                        base_value = np.asarray(vector[i]).reshape(-1)[0]
+                        new_vector[i] = points[len(set_B)] * base_value
                         for j in range(len(modified_base)):
+                            coeff = np.asarray(modified_base[j][i]).reshape(-1)[0]
                             new_vector[i] = (
-                                new_vector[i] + modified_base[j][i] * points[j]
+                                new_vector[i] + coeff * points[j]
                             )
                 elif style == "uniform":
                     for i in range(len(new_vector)):

pm4py/algo/discovery/ocel/interleavings/utils/merge_dataframe_rel_cases.py

@@ -134,11 +134,22 @@ def merge_dataframes(
     )
     del left_df[case_id_key + left_suffix]
 
+    # Rename the right-case column coming from relations to avoid clashing with
+    # the suffix that will be assigned to the right dataframe case column.
+    merge_key = case_id_key + right_suffix
+    if merge_key in left_df.columns:
+        renamed_merge_key = merge_key + "_REL"
+        left_df = left_df.rename(columns={merge_key: renamed_merge_key})
+        merge_key = renamed_merge_key
+
     left_df = left_df.merge(
         right_df,
-        left_on=case_id_key + right_suffix,
+        left_on=merge_key,
         right_on=case_id_key,
         suffixes=(left_suffix, right_suffix),
     )
 
+    if merge_key in left_df.columns and merge_key.endswith("_REL"):
+        del left_df[merge_key]
+
     return left_df

requirements_stable.txt

@@ -1,7 +1,7 @@
 colorama==0.4.6
 contourpy==1.3.3
 cycler==0.12.1
-fonttools==4.60.1
+fonttools==4.61.0
 graphviz==0.21
 kiwisolver==1.4.9
 lxml==6.0.2