Filter: all-included default scenario for filtering + simplify execution engine

Author: aarkue

backend/shared/src/binding_box/mod.rs

@@ -7,7 +7,7 @@ pub mod expand_step;
 #[cfg(test)]
 pub mod test;
 
-use std::{collections::HashSet, fs::File, io::BufWriter, time::Instant};
+use std::{collections::HashSet, env::remove_var, fs::File, io::BufWriter, time::Instant};
 
 use chrono::DateTime;
 use itertools::Itertools;
@@ -215,17 +215,54 @@ pub fn filter_ocel_box_tree(tree: BindingBoxTree, ocel: &IndexLinkedOCEL) -> Opt
     if skipped_bindings {
         println!("Bindings were skipped!");
     }
+    let assume_all_included = !tree.nodes.iter().any(|node| {
+        let node_as_box = node.as_box().unwrap();
+        node_as_box
+            .ob_var_labels
+            .iter()
+            .any(|(_, l)| matches!(l, structs::FilterLabel::INCLUDED))
+            || node_as_box
+                .ev_var_labels
+                .iter()
+                .any(|(_, l)| matches!(l, structs::FilterLabel::INCLUDED))
+    });
     // Filter/Export
     let filter_now = Instant::now();
-    let mut ob_included_indices: HashSet<ObjectIndex> = HashSet::new();
-    let mut ev_included_indices: HashSet<EventIndex> = HashSet::new();
+    let mut ob_included_indices: HashSet<ObjectIndex> = if assume_all_included {
+        ocel.get_all_obs_ref().copied().collect()
+    } else {
+        HashSet::new()
+    };
+    let mut ev_included_indices: HashSet<EventIndex> = if assume_all_included {
+        ocel.get_all_evs_ref().copied().collect()
+    } else {
+        HashSet::new()
+    };
+
     let mut ob_excluded_indices: HashSet<ObjectIndex> = HashSet::new();
     let mut ev_excluded_indices: HashSet<EventIndex> = HashSet::new();
 
-    let mut e2o_rels_included: HashSet<(EventIndex, ObjectIndex, Option<String>)> = HashSet::new();
+    let mut e2o_rels_included: HashSet<(EventIndex, ObjectIndex, Option<String>)> =
+        if assume_all_included {
+            ocel.get_all_evs_ref()
+                .map(|e| ocel.get_e2o(e).map(|r| (*e, *r.1, Some(r.0.to_string()))))
+                .flatten()
+                .collect()
+        } else {
+            HashSet::new()
+        };
     let mut e2o_rels_excluded: HashSet<(EventIndex, ObjectIndex, Option<String>)> = HashSet::new();
 
-    let mut o2o_rels_included: HashSet<(ObjectIndex, ObjectIndex, Option<String>)> = HashSet::new();
+    let mut o2o_rels_included: HashSet<(ObjectIndex, ObjectIndex, Option<String>)> =
+        if assume_all_included {
+            ocel.get_all_obs_ref()
+                .map(|o| ocel.get_o2o(o).map(|r| (*o, *r.1, Some(r.0.to_string()))))
+                .flatten()
+                .collect()
+        } else {
+            HashSet::new()
+        };
+
     let mut o2o_rels_excluded: HashSet<(ObjectIndex, ObjectIndex, Option<String>)> = HashSet::new();
 
     for (index, binding, _viol) in evaluation_results_flat {

backend/shared/src/binding_box/step_order.rs

@@ -15,7 +15,7 @@ pub fn get_expected_relation_count(
     bbox: &BindingBox,
     parent_binding_opt: Option<&Binding>,
     ocel: &IndexLinkedOCEL,
-) -> Option<usize> {
+) -> Option<i32> {
     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)) {
@@ -46,7 +46,7 @@ pub fn get_expected_relation_count(
                 .collect(),
         }
     }
-    let res = bound_by_types
+    let res: usize = bound_by_types
         .into_iter()
         .map(|bound_by_type| {
             // Previously this was based on the average relations of an object/event
@@ -65,8 +65,8 @@ pub fn get_expected_relation_count(
             }
         })
         .sum();
-    println!("{res} for {bound_by:?}");
-    Some(res)
+    // println!("{res} for {bound_by:?}");
+    Some((res as i32))
 }
 impl BindingStep {
     /// Get a binding order from a binding box
@@ -253,10 +253,10 @@ impl BindingStep {
                             .find(|(x, _q, _filter_index, _reversed)| x == var)
                             .map(|t| (v, t))
                     })
-                    .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)
-                    })
+                    // .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)
+                    // })
                     .next()
                 {
                     // `var` can be bound based on `v`!

backend/shared/src/binding_box/structs.rs

@@ -363,7 +363,7 @@ impl BindingBoxTreeNode {
                         // Evaluate Child
                             tree.nodes[*c].evaluate(*c, b.clone(), tree, ocel);
                     child_res.insert(c_name, violations);
-                    if children.len() * c_res.len() * expanded_len > 100_000_000 {
+                    if children.len() * c_res.len() * expanded_len > 150_000_000 {
                         x.cancel();
                         println!(
                             "Too much too handle! {}*{}*{}={}",

frontend/src/components/binding-table/PaginatedBindingTable.tsx

@@ -49,7 +49,7 @@ export function DataTablePagination<TData, TValue>({
     initialState: {
       pagination: {
         pageIndex: 0,
-        pageSize: 10,
+        pageSize: 20,
       },
     },
   });
@@ -66,7 +66,7 @@ export function DataTablePagination<TData, TValue>({
   }, [initialMode]);
   return (
     <div className="w-full">
-      <div className="rounded-md border w-full max-h-[70vh] overflow-auto">
+      <div className="rounded-md border w-full max-h-[73vh] overflow-auto">
         <Table>
           <TableHeader>
             {table.getHeaderGroups().map((headerGroup) => (

frontend/src/routes/visual-editor/VisualEditor.tsx

@@ -953,6 +953,7 @@ export default function VisualEditor(props: VisualEditorProps) {
                         error: "Evaluation failed",
                       },
                     );
+                    console.log(res.bindingsSkipped);
                     if (res.bindingsSkipped) {
                       toast.error(
                         (x) => (

frontend/src/routes/visual-editor/helper/box/variable-names.tsx

@@ -3,6 +3,7 @@ import { VisualEditorContext } from "../VisualEditorContext";
 import { MdEvent } from "react-icons/md";
 import { LuBox } from "react-icons/lu";
 import type { Variable } from "@/types/generated/Variable";
+import clsx from "clsx";
 
 export function getEvVarName(eventVar: number) {
   return function GetEvVarName() {
@@ -30,7 +31,7 @@ export function ObVarName({ obVar, disabledStyle }: { obVar: number, disabledSty
   const { getVarName } = useContext(VisualEditorContext);
   const varInfo = getVarName(obVar, "object");
   return (
-    <span className="font-mono font-semibold" style={{ color: disabledStyle === true ? "darkgray" :varInfo.color }}>
+    <span className={clsx("font-mono font-semibold", disabledStyle === true && "text-stone-400")} style={{ color: disabledStyle === true ? undefined : varInfo.color }}>
       <LuBox className="inline-block -mr-1.5" /> {varInfo.name}
     </span>
   );