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

pm4py · Oct 30, 2023 · 94f98bb · 94f98bb
2 parents 8ca82d9 + 14db8bd
commit 94f98bb
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 22 deletions.
diff --git a/pm4py/statistics/attributes/log/get.py b/pm4py/statistics/attributes/log/get.py
@@ -23,6 +23,7 @@
 from pm4py.util import constants
 from enum import Enum
 from collections import Counter
+from copy import copy
 from typing import Optional, Dict, Any, Union, Tuple, List, Set
 from pm4py.objects.conversion.log import converter as log_converter
 
@@ -279,12 +280,14 @@ def get_kde_numeric_attribute(log, attribute, parameters=None):
     y
         Y-axis values to represent
     """
-    log = log_converter.apply(log, variant=log_converter.Variants.TO_EVENT_LOG, parameters=parameters)
+    if parameters is None:
+        parameters = {}
+
+    this_parameters = copy(parameters)
+    this_parameters["deepcopy"] = False
+    this_parameters["include_case_attributes"] = False
 
-    if type(log) is EventLog:
-        event_log = log_conversion.apply(log, variant=log_conversion.TO_EVENT_STREAM, parameters={"deepcopy": False, "include_case_attributes": False})
-    else:
-        event_log = log
+    event_log = log_conversion.apply(log, variant=log_conversion.TO_EVENT_STREAM, parameters=this_parameters)
 
     values = [event[attribute] for event in event_log if attribute in event]
 
@@ -314,12 +317,14 @@ def get_kde_numeric_attribute_json(log, attribute, parameters=None):
     y
         Y-axis values to represent
     """
-    log = log_converter.apply(log, variant=log_converter.Variants.TO_EVENT_LOG, parameters=parameters)
+    if parameters is None:
+        parameters = {}
+
+    this_parameters = copy(parameters)
+    this_parameters["deepcopy"] = False
+    this_parameters["include_case_attributes"] = False
 
-    if type(log) is EventLog:
-        event_log = log_conversion.apply(log, variant=log_conversion.TO_EVENT_STREAM, parameters={"deepcopy": False, "include_case_attributes": False})
-    else:
-        event_log = log
+    event_log = log_conversion.apply(log, variant=log_conversion.TO_EVENT_STREAM, parameters=this_parameters)
 
     values = [event[attribute] for event in event_log if attribute in event]
 
@@ -348,12 +353,14 @@ def get_kde_date_attribute(log, attribute=DEFAULT_TIMESTAMP_KEY, parameters=None
     y
         Y-axis values to represent
     """
-    log = log_converter.apply(log, variant=log_converter.Variants.TO_EVENT_LOG, parameters=parameters)
+    if parameters is None:
+        parameters = {}
+
+    this_parameters = copy(parameters)
+    this_parameters["deepcopy"] = False
+    this_parameters["include_case_attributes"] = False
 
-    if type(log) is EventLog:
-        event_log = log_conversion.apply(log, variant=log_conversion.TO_EVENT_STREAM, parameters={"deepcopy": False, "include_case_attributes": False})
-    else:
-        event_log = log
+    event_log = log_conversion.apply(log, variant=log_conversion.TO_EVENT_STREAM, parameters=this_parameters)
 
     values = [event[attribute].replace(tzinfo=None) for event in event_log if attribute in event]
 
@@ -383,12 +390,14 @@ def get_kde_date_attribute_json(log, attribute=DEFAULT_TIMESTAMP_KEY, parameters
     y
         Y-axis values to represent
     """
-    log = log_converter.apply(log, variant=log_converter.Variants.TO_EVENT_LOG, parameters=parameters)
+    if parameters is None:
+        parameters = {}
+
+    this_parameters = copy(parameters)
+    this_parameters["deepcopy"] = False
+    this_parameters["include_case_attributes"] = False
 
-    if type(log) is EventLog:
-        event_log = log_conversion.apply(log, variant=log_conversion.TO_EVENT_STREAM, parameters={"deepcopy": False, "include_case_attributes": False})
-    else:
-        event_log = log
+    event_log = log_conversion.apply(log, variant=log_conversion.TO_EVENT_STREAM, parameters=this_parameters)
 
     values = [event[attribute].replace(tzinfo=None) for event in event_log if attribute in event]
 

diff --git a/tests/algorithm_test.py b/tests/algorithm_test.py
@@ -18,12 +18,12 @@ def test_importing_xes(self):
         log = xes_importer.apply(os.path.join("input_data", "running-example.xes"),
                                  variant=xes_importer.Variants.CHUNK_REGEX)
 
-    def test_hiearch_clustering(self):
+    """def test_hiearch_clustering(self):
         from pm4py.algo.clustering.trace_attribute_driven import algorithm as clust_algorithm
         log = xes_importer.apply(os.path.join("input_data", "receipt.xes"), variant=xes_importer.Variants.LINE_BY_LINE,
                                  parameters={xes_importer.Variants.LINE_BY_LINE.value.Parameters.MAX_TRACES: 50})
         # raise Exception("%d" % (len(log)))
-        clust_algorithm.apply(log, "responsible", variant=clust_algorithm.Variants.VARIANT_DMM_VEC)
+        clust_algorithm.apply(log, "responsible", variant=clust_algorithm.Variants.VARIANT_DMM_VEC)"""
 
     def test_log_skeleton(self):
         log = xes_importer.apply(os.path.join("input_data", "running-example.xes"))