Optimizations

Author: aarkue

backend/shared/src/binding_box/expand_step.rs

@@ -40,7 +40,7 @@ impl BindingBox {
     }
 
     pub fn expand(&self, parent_binding: Binding, ocel: &IndexLinkedOCEL) -> (Vec<Binding>, bool) {
-        let order = BindingStep::get_binding_order(self, Some(&parent_binding), Some(ocel));
+        let order = BindingStep::get_binding_order(self, Some(&parent_binding), ocel);
         self.expand_with_steps(parent_binding, ocel, &order)
     }
 

backend/shared/src/binding_box/step_order.rs

@@ -3,7 +3,7 @@ use std::collections::{HashMap, HashSet};
 use itertools::Itertools;
 use process_mining::ocel::linked_ocel::{IndexLinkedOCEL, LinkedOCELAccess};
 
-use crate::discovery::advanced::EventOrObjectType;
+use crate::discovery::advanced::EventOrObjectTypeRef;
 
 use super::{
     structs::{BindingBox, BindingStep, Filter, Qualifier, Variable},
@@ -14,53 +14,58 @@ pub fn get_expected_relation_count(
     bound_by: &Variable,
     bbox: &BindingBox,
     parent_binding_opt: Option<&Binding>,
-    ocel: Option<&IndexLinkedOCEL>,
-) -> Option<f32> {
-    if ocel.is_none() {
-        eprintln!("NO OCEL?! for step order");
-        return None;
-    }
+    ocel: &IndexLinkedOCEL,
+) -> Option<usize> {
     let mut bound_by_types = Vec::new();
     // First check if bound_by is already bound by parent
     if let Some(bound_by_index) = parent_binding_opt.and_then(|b| b.get_any_index(bound_by)) {
-        if let Some(ocel) = ocel {
-            let bound_by_type = match bound_by_index {
-                process_mining::ocel::linked_ocel::index_linked_ocel::EventOrObjectIndex::Event(event_index) => EventOrObjectType::Event(ocel.get_ev(&event_index).event_type.clone()),
-                process_mining::ocel::linked_ocel::index_linked_ocel::EventOrObjectIndex::Object(object_index) => EventOrObjectType::Object(ocel.get_ob(&object_index).object_type.clone()),
-                };
-            bound_by_types.push(bound_by_type);
-        }
+        let bound_by_type = match bound_by_index {
+            process_mining::ocel::linked_ocel::index_linked_ocel::EventOrObjectIndex::Event(
+                event_index,
+            ) => EventOrObjectTypeRef::Event(ocel.get_ev(&event_index).event_type.as_str()),
+            process_mining::ocel::linked_ocel::index_linked_ocel::EventOrObjectIndex::Object(
+                object_index,
+            ) => EventOrObjectTypeRef::Object(ocel.get_ob(&object_index).object_type.as_str()),
+        };
+        bound_by_types.push(bound_by_type);
     } else {
         bound_by_types = match bound_by {
             Variable::Event(var_ev) => bbox
                 .new_event_vars
                 .get(var_ev)
                 .unwrap()
                 .iter()
-                .map(|t| EventOrObjectType::Event(t.clone()))
+                .map(|t| EventOrObjectTypeRef::Event(t.as_str()))
                 .collect(),
             Variable::Object(var_ob) => bbox
                 .new_object_vars
                 .get(var_ob)
                 .unwrap()
                 .iter()
-                .map(|t| EventOrObjectType::Object(t.clone()))
+                .map(|t| EventOrObjectTypeRef::Object(t.as_str()))
                 .collect(),
         }
     }
     let res = bound_by_types
         .into_iter()
         .map(|bound_by_type| {
-            // TODO
-            0.0
-            // ocel.unwrap()
-            //     .avg_rels_of_type_per_type
-            //     .get(&bound_by_type)
-            //     .copied()
-            //     .unwrap_or_default()
+            // Previously this was based on the average relations of an object/event
+            // Now it's simply the count (how many exist)
+            match bound_by_type {
+                EventOrObjectTypeRef::Event(t) => ocel
+                    .events_per_type
+                    .get(t)
+                    .map(|es| es.len())
+                    .unwrap_or_default(),
+                EventOrObjectTypeRef::Object(t) => ocel
+                    .objects_per_type
+                    .get(t)
+                    .map(|es| es.len())
+                    .unwrap_or_default(),
+            }
         })
         .sum();
-    // println!("{res} for {var:?} {bound_by:?}");
+    println!("{res} for {bound_by:?}");
     Some(res)
 }
 impl BindingStep {
@@ -75,7 +80,7 @@ impl BindingStep {
     pub fn get_binding_order(
         bbox: &BindingBox,
         parent_binding_opt: Option<&Binding>,
-        ocel: Option<&IndexLinkedOCEL>,
+        ocel: &IndexLinkedOCEL,
     ) -> Vec<Self> {
         let mut ret = Vec::new();
 
@@ -251,8 +256,7 @@ impl BindingStep {
                     })
                     .sorted_by_cached_key(|(bound_by_var, (_v, _q, _filter_index, _reversed))| {
                         get_expected_relation_count(bound_by_var, bbox, parent_binding_opt, ocel)
-                            .unwrap_or(10.0)
-                            .round() as usize
+                            .unwrap_or(10)
                     })
                     .next()
                 {

backend/shared/src/discovery/advanced/mod.rs

@@ -285,3 +285,17 @@ impl EventOrObjectType {
         }
     }
 }
+#[derive(Debug, Clone, PartialEq, Eq, Hash)]
+pub enum EventOrObjectTypeRef<'a> {
+    Event(&'a str),
+    Object(&'a str),
+}
+
+impl<'a> EventOrObjectTypeRef<'a> {
+    pub fn inner(&'a self) -> &'a str {
+        match self {
+            EventOrObjectTypeRef::Event(et) => et,
+            EventOrObjectTypeRef::Object(ot) => ot,
+        }
+    }
+}

backend/web-server/src/main.rs

@@ -207,7 +207,7 @@ pub async fn get_qualifers_for_object_types<'a>(
     Json<Option<HashMap<String, HashSet<QualifierAndObjectType>>>>,
 ) {
     let qualifier_and_type =
-        with_ocel_from_state(&State(state), |ocel| get_object_rels_per_type(ocel));
+        with_ocel_from_state(&State(state), get_object_rels_per_type);
     match qualifier_and_type {
         Some(x) => (StatusCode::OK, Json(Some(x))),
         None => (StatusCode::BAD_REQUEST, Json(None)),

tauri/src-tauri/Cargo.toml

@@ -25,7 +25,7 @@ url = "2.5.2"
 tauri-plugin-process = "2"
 tauri-plugin-log = "2"
 log = "0.4.27"
-
+mimalloc = { version = "0.1.47", default-features = false }
 
 [features]
 # this feature is used for production builds or when `devPath` points to the filesystem and the built-in dev server is disabled.

tauri/src-tauri/src/main.rs

@@ -1,6 +1,9 @@
 // Prevents additional console window on Windows in release, DO NOT REMOVE!!
 #![cfg_attr(not(debug_assertions), windows_subsystem = "windows")]
 
+#[global_allocator]
+static GLOBAL: mimalloc::MiMalloc = mimalloc::MiMalloc;
+
 use std::{
     collections::{HashMap, HashSet},
     fs::File,