Skip to content

Commit 4d7d55e

Browse files
committed
Lint & Format
1 parent f181637 commit 4d7d55e

File tree

6 files changed

+28
-42
lines changed

6 files changed

+28
-42
lines changed

Diff for: backend/shared/src/binding_box/expand_step.rs

+20-24
Original file line numberDiff line numberDiff line change
@@ -133,31 +133,27 @@ impl BindingBox {
133133
let ob_index = b.get_ob_index(from_ob_var_name).unwrap();
134134
let ob = ocel.ob_by_index(&ob_index).unwrap();
135135
let ev_types = self.new_event_vars.get(ev_var_name).unwrap();
136-
get_events_of_type_associated_with_objects(
137-
ocel,
138-
ev_types,
139-
&[*ob_index],
140-
)
141-
.into_iter()
142-
.filter_map(move |e_index| {
143-
// TODO: Better to also have an relationship index in IndexLinkedOCEL
144-
let e = ocel.ev_by_index(&e_index).unwrap();
145-
if qualifier.is_none()
146-
|| e.relationships.as_ref().is_some_and(|rels| {
147-
rels.iter().any(|rel| {
148-
rel.object_id == ob.id
149-
&& &rel.qualifier == qualifier.as_ref().unwrap()
136+
get_events_of_type_associated_with_objects(ocel, ev_types, &[*ob_index])
137+
.into_iter()
138+
.filter_map(move |e_index| {
139+
// TODO: Better to also have an relationship index in IndexLinkedOCEL
140+
let e = ocel.ev_by_index(&e_index).unwrap();
141+
if qualifier.is_none()
142+
|| e.relationships.as_ref().is_some_and(|rels| {
143+
rels.iter().any(|rel| {
144+
rel.object_id == ob.id
145+
&& &rel.qualifier == qualifier.as_ref().unwrap()
146+
})
150147
})
151-
})
152-
{
153-
Some(b.clone().expand_with_ev(
154-
*ev_var_name,
155-
*ocel.event_index_map.get(&e.id).unwrap(),
156-
))
157-
} else {
158-
None
159-
}
160-
})
148+
{
149+
Some(b.clone().expand_with_ev(
150+
*ev_var_name,
151+
*ocel.event_index_map.get(&e.id).unwrap(),
152+
))
153+
} else {
154+
None
155+
}
156+
})
161157
})
162158
.collect();
163159
}

Diff for: backend/shared/src/binding_box/mod.rs

-2
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,11 @@ pub struct EvaluateBoxTreeResult {
2626
pub event_ids: Vec<String>,
2727
}
2828

29-
3029
#[derive(Serialize, Deserialize)]
3130
pub struct CheckWithBoxTreeRequest {
3231
pub tree: BindingBoxTree,
3332
}
3433

35-
3634
#[derive(TS)]
3735
#[ts(export, export_to = "../../../frontend/src/types/generated/")]
3836
#[derive(Debug, Default, Clone, Serialize, Deserialize)]

Diff for: backend/shared/src/binding_box/test.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,8 @@ use itertools::Itertools;
44
use process_mining::import_ocel_json_from_path;
55

66
use crate::{
7-
binding_box::structs::{BindingBoxTree, BindingBoxTreeNode, FilterConstraint, ViolationReason}, preprocessing::linked_ocel::link_ocel_info,
7+
binding_box::structs::{BindingBoxTree, BindingBoxTreeNode, FilterConstraint, ViolationReason},
8+
preprocessing::linked_ocel::link_ocel_info,
89
};
910

1011
use super::{BindingBox, BindingStep};

Diff for: backend/shared/src/discovery/evaluation.rs

+5-13
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,7 @@ pub fn get_count_constraint_fraction(
3333
let counts_len = counts.len();
3434
let supporting_obj_ids_ref: Vec<_> = counts
3535
.into_iter()
36-
.filter(|(count, _obj_id)| {
37-
c.max_count >= *count && c.min_count <= *count
38-
})
36+
.filter(|(count, _obj_id)| c.max_count >= *count && c.min_count <= *count)
3937
.map(|(_c, obj_id)| obj_id)
4038
.collect();
4139
let num_supporting_objs = supporting_obj_ids_ref.len();
@@ -72,16 +70,10 @@ pub fn get_ef_constraint_fraction(
7270
let (total_from_ev_count, total_sat_from_ev_count) = object_ids
7371
.par_iter()
7472
.map(|obj_id| {
75-
let from_evs = get_events_of_type_associated_with_objects(
76-
linked_ocel,
77-
&from_ev_type,
78-
&[obj_id],
79-
);
80-
let to_evs = get_events_of_type_associated_with_objects(
81-
linked_ocel,
82-
&to_ev_type,
83-
&[obj_id],
84-
);
73+
let from_evs =
74+
get_events_of_type_associated_with_objects(linked_ocel, &from_ev_type, &[obj_id]);
75+
let to_evs =
76+
get_events_of_type_associated_with_objects(linked_ocel, &to_ev_type, &[obj_id]);
8577
let num_from_evs = from_evs.len();
8678
let num_sat_from_evs = from_evs
8779
.iter()

Diff for: backend/shared/src/lib.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,9 @@ pub mod binding_box;
88
pub mod constraints_2;
99
pub mod discovery;
1010
pub mod preprocessing {
11+
pub mod linked_ocel;
1112
pub mod preprocess;
1213
pub mod tests;
13-
pub mod linked_ocel;
1414
}
1515

1616
#[derive(Debug, Serialize, Deserialize)]

Diff for: backend/shared/src/preprocessing/linked_ocel.rs

-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,6 @@ pub fn get_events_of_type_associated_with_objects<'a>(
7171
.unwrap()
7272
.iter()
7373
.filter(|e_index| {
74-
7574
event_types.contains(&linked_ocel.ev_by_index(&e_index).unwrap().event_type)
7675
})
7776
.copied()

0 commit comments

Comments
 (0)