Skip to content

Commit

Permalink
Merge remote-tracking branch 'upstream/hotfixes' into release
Browse files Browse the repository at this point in the history
  • Loading branch information
fit-alessandro-berti committed Aug 7, 2023
2 parents cf73cae + 2613976 commit cd678f2
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 3 deletions.
5 changes: 4 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,10 @@
* fixed divergence from Github repo
* e0cbce6b90a16ef1e21edca45b83d69e1743674c
* fixed typo in OCPN discovery method

* 0af7368ce306678466df759ca15359c1e3901bcd
* fixed discover_petri_net_inductive multi_processing parameter
default value.

### Removed
* bf5574a34a31b93024dd9feb54acc5cc475640bd
* change-of-mind on format_dataframe deprecation warning
Expand Down
2 changes: 1 addition & 1 deletion pm4py/discovery.py
Original file line number Diff line number Diff line change
Expand Up @@ -292,7 +292,7 @@ def discover_petri_net_alpha_plus(log: Union[EventLog, pd.DataFrame], activity_k
return alpha_miner.apply(log, variant=alpha_miner.Variants.ALPHA_VERSION_PLUS, parameters=get_properties(log, activity_key=activity_key, timestamp_key=timestamp_key, case_id_key=case_id_key))


def discover_petri_net_inductive(log: Union[EventLog, pd.DataFrame, DFG], multi_processing: bool = False, noise_threshold: float = 0.0, activity_key: str = "concept:name", timestamp_key: str = "time:timestamp", case_id_key: str = "case:concept:name") -> Tuple[
def discover_petri_net_inductive(log: Union[EventLog, pd.DataFrame, DFG], multi_processing: bool = constants.ENABLE_MULTIPROCESSING_DEFAULT, noise_threshold: float = 0.0, activity_key: str = "concept:name", timestamp_key: str = "time:timestamp", case_id_key: str = "case:concept:name") -> Tuple[
PetriNet, Marking, Marking]:
"""
Discovers a Petri net using the inductive miner algorithm.
Expand Down
2 changes: 1 addition & 1 deletion requirements_stable.txt
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ colorama==0.4.6
contourpy==1.1.0
cycler==0.11.0
deprecation==2.1.0
fonttools==4.41.1
fonttools==4.42.0
graphviz==0.20.1
intervaltree==3.1.0
kiwisolver==1.4.4
Expand Down

0 comments on commit cd678f2

Please sign in to comment.