Skip to content
Snippets Groups Projects
Commit 07f342f0 authored by Nour's avatar Nour
Browse files

testing the merge

parent 90c69e9d
Branches
No related tags found
No related merge requests found
...@@ -24,15 +24,15 @@ def add_end_event(process, event_id, end_timestamp): ...@@ -24,15 +24,15 @@ def add_end_event(process, event_id, end_timestamp):
# add functions for adding events with their attributes to the log # add functions for adding events with their attributes to the log
<<<<<<<< HEAD:Simpy_Tutorial/eventlog.py
def export_to_csv(process, file_path): def export_to_csv(process, file_path):
event_log_df = pd.DataFrame.from_dict(process.event_log) event_log_df = pd.DataFrame.from_dict(process.event_log)
event_log_df.to_csv(file_path, index=False) event_log_df.to_csv(file_path, index=False)
========
def export_to_csv(env, file_path): def export_to_csv(env, file_path):
event_log_df = pd.DataFrame.from_dict(env.bigeventlog) event_log_df = pd.DataFrame.from_dict(env.bigeventlog)
event_log_df.to_csv(file_path) event_log_df.to_csv(file_path)
>>>>>>>> origin/aleks2:backend/eventlog.py
def export_to_xes(process, file_path): def export_to_xes(process, file_path):
# Use appropriate code to export to XES format # Use appropriate code to export to XES format
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment