Merge pull request #127 from marvin-hansen/main

Narrowed down overly general type constrains on generic type parameters.
deepcausality-rs · Jan 25, 2024 · f78bbb0 · f78bbb0
2 parents a14ae43 + 12db26c
commit f78bbb0
Show file tree

Hide file tree

Showing 61 changed files with 742 additions and 83 deletions.
diff --git a/deep_causality/src/protocols/contextuable/mod.rs b/deep_causality/src/protocols/contextuable/mod.rs
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) "2023" . The DeepCausality Authors. All Rights Reserved.
 
+use std::hash::Hash;
 use std::ops::*;
 
 use crate::prelude::{ContextoidType, Identifiable, TimeScale};
@@ -21,7 +22,15 @@ pub trait Datable: Identifiable {}
 ///
 pub trait Temporable<V>: Identifiable
 where
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     fn time_scale(&self) -> TimeScale;
     fn time_unit(&self) -> &V;
@@ -42,7 +51,15 @@ where
 ///
 pub trait Spatial<V>: Identifiable
 where
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     fn x(&self) -> &V;
     fn y(&self) -> &V;
@@ -64,7 +81,15 @@ where
 ///
 pub trait SpaceTemporal<V>: Identifiable + Spatial<V> + Temporable<V>
 where
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     fn t(&self) -> &V; // returns 4th dimension, t
 }
@@ -91,7 +116,15 @@ where
     S: Spatial<V>,
     ST: SpaceTemporal<V>,
     T: Temporable<V>,
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     fn vertex_type(&self) -> &ContextoidType<D, S, T, ST, V>;
 }
diff --git a/deep_causality/src/protocols/contextuable_graph/mod.rs b/deep_causality/src/protocols/contextuable_graph/mod.rs
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) "2023" . The DeepCausality Authors. All Rights Reserved.
 
+use std::hash::Hash;
 use std::ops::{Add, Mul, Sub};
 
 use crate::errors::ContextIndexError;
@@ -31,7 +32,15 @@ where
     S: Spatial<V>,
     ST: SpaceTemporal<V>,
     T: Temporable<V>,
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     fn add_node(&mut self, value: Contextoid<D, S, T, ST, V>) -> usize;
     fn contains_node(&self, index: usize) -> bool;
@@ -80,7 +89,15 @@ where
     S: Spatial<V>,
     ST: SpaceTemporal<V>,
     T: Temporable<V>,
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     // Creates a new context and returns the index of the new context.
     fn extra_ctx_add_new(&mut self, capacity: usize, default: bool) -> u64;

diff --git a/deep_causality/src/types/context_types/context_graph/contextuable_graph.rs b/deep_causality/src/types/context_types/context_graph/contextuable_graph.rs
@@ -9,7 +9,15 @@ where
     S: Spatial<V>,
     T: Temporable<V>,
     ST: SpaceTemporal<V>,
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     /// Ads a new Contextoid to the context.
     /// You can add the same contextoid multiple times,

diff --git a/deep_causality/src/types/context_types/context_graph/debug.rs b/deep_causality/src/types/context_types/context_graph/debug.rs
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) "2023" . The DeepCausality Authors. All Rights Reserved.
 use std::fmt::{Debug, Display, Formatter};
+use std::hash::Hash;
 use std::ops::*;
 
 use crate::prelude::{Context, Datable, SpaceTemporal, Spatial, Temporable};
@@ -12,7 +13,15 @@ where
     S: Spatial<V>,
     T: Temporable<V>,
     ST: SpaceTemporal<V>,
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     fn format(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         write!(
@@ -32,7 +41,15 @@ where
     S: Spatial<V>,
     T: Temporable<V>,
     ST: SpaceTemporal<V>,
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         self.format(f)
@@ -45,7 +62,15 @@ where
     S: Spatial<V>,
     T: Temporable<V>,
     ST: SpaceTemporal<V>,
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         self.format(f)

diff --git a/deep_causality/src/types/context_types/context_graph/extendable_contextuable_graph.rs b/deep_causality/src/types/context_types/context_graph/extendable_contextuable_graph.rs
@@ -10,7 +10,15 @@ where
     S: Spatial<V>,
     T: Temporable<V>,
     ST: SpaceTemporal<V>,
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     fn extra_ctx_add_new(&mut self, capacity: usize, default: bool) -> u64 {
         if self.extra_contexts.is_none() {
@@ -191,7 +199,15 @@ where
     S: Spatial<V>,
     T: Temporable<V>,
     ST: SpaceTemporal<V>,
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     fn get_current_extra_context(
         &self,

diff --git a/deep_causality/src/types/context_types/context_graph/identifiable.rs b/deep_causality/src/types/context_types/context_graph/identifiable.rs
@@ -1,3 +1,4 @@
+use std::hash::Hash;
 // SPDX-License-Identifier: MIT
 // Copyright (c) "2023" . The DeepCausality Authors. All Rights Reserved.
 use std::ops::*;
@@ -10,7 +11,15 @@ where
     S: Spatial<V>,
     T: Temporable<V>,
     ST: SpaceTemporal<V>,
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     /// Returns the id of the context.
     fn id(&self) -> u64 {

diff --git a/deep_causality/src/types/context_types/context_graph/indexable.rs b/deep_causality/src/types/context_types/context_graph/indexable.rs
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) "2024" . The DeepCausality Authors. All Rights Reserved.
 
+use std::hash::Hash;
 use std::ops::{Add, Mul, Sub};
 
 use crate::prelude::{Context, Datable, Indexable, SpaceTemporal, Spatial, Temporable};
@@ -11,7 +12,15 @@ where
     S: Spatial<V>,
     T: Temporable<V>,
     ST: SpaceTemporal<V>,
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     fn get_index(&self, key: &usize, current: bool) -> Option<&usize> {
         {

diff --git a/deep_causality/src/types/context_types/context_graph/mod.rs b/deep_causality/src/types/context_types/context_graph/mod.rs
@@ -2,6 +2,7 @@
 // Copyright (c) "2023" . The DeepCausality Authors. All Rights Reserved.
 
 use std::collections::HashMap;
+use std::hash::Hash;
 use std::ops::*;
 
 use ultragraph::prelude::*;
@@ -24,7 +25,15 @@ where
     S: Spatial<V>,
     T: Temporable<V>,
     ST: SpaceTemporal<V>,
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     id: u64,
     name: &'l str,
@@ -42,7 +51,15 @@ where
     S: Spatial<V>,
     T: Temporable<V>,
     ST: SpaceTemporal<V>,
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     /// Creates a new context with the given node capacity.
     pub fn with_capacity(id: u64, name: &'l str, capacity: usize) -> Self {

diff --git a/deep_causality/src/types/context_types/contextoid/contextoid_type.rs b/deep_causality/src/types/context_types/contextoid/contextoid_type.rs
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: MIT
 // Copyright (c) "2023" . The DeepCausality Authors. All Rights Reserved.
 use std::fmt::{Display, Formatter};
+use std::hash::Hash;
 use std::marker::PhantomData;
 use std::ops::*;
 
@@ -25,7 +26,15 @@ where
     S: Spatial<V>,
     T: Temporable<V>,
     ST: SpaceTemporal<V>,
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     Datoid(D),
     Tempoid(T),
@@ -41,7 +50,15 @@ where
     S: Spatial<V>,
     T: Temporable<V>,
     ST: SpaceTemporal<V>,
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     pub fn root(&self) -> Option<&Root> {
         if let ContextoidType::Root(b) = self {
@@ -87,7 +104,16 @@ where
     S: Display + Spatial<V>,
     T: Display + Temporable<V>,
     ST: Display + SpaceTemporal<V>,
-    V: Display + Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Display
+        + Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     fn fmt(&self, f: &mut Formatter<'_>) -> std::fmt::Result {
         match self {

diff --git a/deep_causality/src/types/context_types/contextoid/contextuable.rs b/deep_causality/src/types/context_types/contextoid/contextuable.rs
@@ -1,3 +1,4 @@
+use std::hash::Hash;
 // SPDX-License-Identifier: MIT
 // Copyright (c) "2023" . The DeepCausality Authors. All Rights Reserved.
 use std::ops::*;
@@ -12,7 +13,15 @@ where
     S: Spatial<V>,
     T: Temporable<V>,
     ST: SpaceTemporal<V>,
-    V: Default + Add<V, Output = V> + Sub<V, Output = V> + Mul<V, Output = V>,
+    V: Default
+        + Copy
+        + Clone
+        + Hash
+        + Eq
+        + PartialEq
+        + Add<V, Output = V>
+        + Sub<V, Output = V>
+        + Mul<V, Output = V>,
 {
     fn vertex_type(&self) -> &ContextoidType<D, S, T, ST, V> {
         &self.vertex_type