Merge pull request #369 from marvin-hansen/main

Refactored the Causaloid context to use Arc<RwLock>,

Author: marvin-hansen

Cargo.lock

@@ -5,17 +5,17 @@ module(name = "deep_causality")
 # https://registry.bazel.build/
 ###############################################################################
 bazel_dep(name = "aspect_bazel_lib", version = "2.16.0")
-bazel_dep(name = "bazel_skylib", version = "1.8.1")
+bazel_dep(name = "bazel_skylib", version = "1.8.2")
 bazel_dep(name = "platforms", version = "1.0.0")
-bazel_dep(name = "rules_rust", version = "0.65.0")
+bazel_dep(name = "rules_rust", version = "0.67.0")
 
 ###############################################################################
 # Rust toolchain
 # https://github.com/bazelbuild/rules_rust/releases
 ###############################################################################
 RUST_EDITION = "2024"
 
-RUST_VERSION = "1.90.0"
+RUST_VERSION = "1.91.0"
 
 rust = use_extension("@rules_rust//rust:extensions.bzl", "rust")
 rust.toolchain(

MODULE.bazel

@@ -3,7 +3,7 @@
  * Copyright (c) "2025" . The DeepCausality Authors and Contributors. All Rights Reserved.
  */
 use crate::{AssumptionError, CausalityError, Context, PropagatingEffect};
-use std::sync::Arc;
+use std::sync::{Arc, RwLock};
 
 // Fn aliases for assumable, assumption, & assumption collection
 /// Function type for evaluating numerical values and returning a boolean result.
@@ -39,5 +39,5 @@ pub type CausalFn = fn(effect: &PropagatingEffect) -> Result<PropagatingEffect,
 pub type ContextualCausalFn<D, S, T, ST, SYM, VS, VT> =
     fn(
         effect: &PropagatingEffect,
-        context: &Arc<Context<D, S, T, ST, SYM, VS, VT>>,
+        context: &Arc<RwLock<Context<D, S, T, ST, SYM, VS, VT>>>,
     ) -> Result<PropagatingEffect, CausalityError>;

MODULE.bazel.lock

@@ -16,7 +16,7 @@ where
     VS: Clone,
     VT: Clone,
 {
-    pub fn context(&self) -> &Option<Arc<Context<D, S, T, ST, SYM, VS, VT>>> {
+    pub fn context(&self) -> &Option<Arc<RwLock<Context<D, S, T, ST, SYM, VS, VT>>>> {
         &self.context
     }
 

deep_causality/src/alias/alias_function.rs

@@ -35,7 +35,7 @@ where
     causal_type: CausaloidType,
     causal_fn: Option<CausalFn>,
     context_causal_fn: Option<ContextualCausalFn<D, S, T, ST, SYM, VS, VT>>,
-    context: Option<Arc<Context<D, S, T, ST, SYM, VS, VT>>>,
+    context: Option<Arc<RwLock<Context<D, S, T, ST, SYM, VS, VT>>>>,
     // The last calculated effect of this causaloid. It's an Option because a
     // causaloid may not have been evaluated yet.
     effect: ArcRWLock<Option<PropagatingEffect>>,
@@ -90,7 +90,7 @@ where
     pub fn new_with_context(
         id: IdentificationValue,
         context_causal_fn: ContextualCausalFn<D, S, T, ST, SYM, VS, VT>,
-        context: Arc<Context<D, S, T, ST, SYM, VS, VT>>,
+        context: Arc<RwLock<Context<D, S, T, ST, SYM, VS, VT>>>,
         description: &str,
     ) -> Self {
         Causaloid {
@@ -140,7 +140,7 @@ where
     pub fn from_causal_collection_with_context(
         id: IdentificationValue,
         causal_coll: Arc<Vec<Causaloid<D, S, T, ST, SYM, VS, VT>>>,
-        context: Arc<Context<D, S, T, ST, SYM, VS, VT>>,
+        context: Arc<RwLock<Context<D, S, T, ST, SYM, VS, VT>>>,
         description: &str,
     ) -> Self {
         Causaloid {
@@ -190,7 +190,7 @@ where
     pub fn from_causal_graph_with_context(
         id: IdentificationValue,
         causal_graph: Arc<CausaloidGraph<Causaloid<D, S, T, ST, SYM, VS, VT>>>,
-        context: Arc<Context<D, S, T, ST, SYM, VS, VT>>,
+        context: Arc<RwLock<Context<D, S, T, ST, SYM, VS, VT>>>,
         description: &str,
     ) -> Self {
         Causaloid {

deep_causality/src/types/causal_types/causaloid/getters.rs

@@ -4,7 +4,7 @@
  */
 
 use crate::{Causaloid, Context, Datable, SpaceTemporal, Spatial, Symbolic, Temporal};
-use std::sync::Arc;
+use std::sync::{Arc, RwLock};
 
 // Constructors
 #[allow(clippy::type_complexity)]
@@ -18,7 +18,7 @@ where
     VS: Clone,
     VT: Clone,
 {
-    pub fn set_context(&mut self, context: Option<Arc<Context<D, S, T, ST, SYM, VS, VT>>>) {
+    pub fn set_context(&mut self, context: Option<Arc<RwLock<Context<D, S, T, ST, SYM, VS, VT>>>>) {
         self.context = context;
     }
 }

deep_causality/src/types/causal_types/causaloid/mod.rs

@@ -143,7 +143,8 @@ where
         if let Some((ethos, tags)) = &self.effect_ethos {
             if let Some(context) = state.context() {
                 let proposed_action = self.create_proposed_action(state, effect)?;
-                let verdict = ethos.evaluate_action(&proposed_action, context, tags)?;
+                let context_guard = context.read().unwrap();
+                let verdict = ethos.evaluate_action(&proposed_action, &context_guard, tags)?;
 
                 if verdict.outcome() == TeloidModal::Impermissible {
                     let explanation = ethos.explain_verdict(&verdict)?;

deep_causality/src/types/causal_types/causaloid/setters.rs

@@ -7,7 +7,7 @@ use crate::{
     CausalState, Causaloid, Context, Datable, PropagatingEffect, SpaceTemporal, Spatial, Symbolic,
     Temporal, UncertainParameter,
 };
-use std::sync::Arc;
+use std::sync::{Arc, RwLock};
 
 impl<D, S, T, ST, SYM, VS, VT> CausalState<D, S, T, ST, SYM, VS, VT>
 where
@@ -36,7 +36,7 @@ where
     }
 
     #[allow(clippy::type_complexity)]
-    pub fn context(&self) -> &Option<Arc<Context<D, S, T, ST, SYM, VS, VT>>> {
+    pub fn context(&self) -> &Option<Arc<RwLock<Context<D, S, T, ST, SYM, VS, VT>>>> {
         self.causaloid.context()
     }
 

deep_causality/src/types/csm_types/csm/eval.rs

@@ -6,7 +6,7 @@
 use crate::{
     Assumption, Causaloid, Context, Datable, Model, SpaceTemporal, Spatial, Symbolic, Temporal,
 };
-use std::sync::Arc;
+use std::sync::{Arc, RwLock};
 
 #[allow(clippy::type_complexity)]
 impl<D, S, T, ST, SYM, VS, VT> Model<D, S, T, ST, SYM, VS, VT>
@@ -35,7 +35,7 @@ where
         &self.causaloid
     }
 
-    pub fn context(&self) -> &Option<Arc<Context<D, S, T, ST, SYM, VS, VT>>> {
+    pub fn context(&self) -> &Option<Arc<RwLock<Context<D, S, T, ST, SYM, VS, VT>>>> {
         &self.context
     }
 }