restructure

gizatechxyz · Aug 11, 2024 · f1b6961 · f1b6961
1 parent 6137f22
commit f1b6961
Show file tree

Hide file tree

Showing 12 changed files with 42 additions and 8 deletions.
diff --git a/packages/algo/.tool-versions → .tool-versions b/packages/algo/.tool-versions → .tool-versions
diff --git a/Scarb.toml b/Scarb.toml
@@ -1,5 +1,10 @@
 [workspace]
-members = ["packages/algo", "packages/ml", "packages/numbers"]
+members = [
+    "packages/algo",
+    "packages/ml",
+    "packages/numbers",
+    "package/data_structures",
+]
 name = "orion"
 version = "0.1.0"
 description = "Cairo libraries to build the intelligence of verifiable agents"
@@ -15,4 +20,3 @@ definitions = "proto/orion.proto"
 
 [cairo]
 enable-gas = false
-
diff --git a/packages/algo/Scarb.toml b/packages/algo/Scarb.toml
@@ -10,6 +10,7 @@ cairo_test = "2.7.0"
 
 [dependencies]
 orion_numbers = { path = "../numbers" }
+orion_data_structures = { path = "../data_structures" }
 
 [cairo]
 enable-gas=false
diff --git a/packages/algo/src/algo/cdf.cairo b/packages/algo/src/algo/cdf.cairo
@@ -1,6 +1,6 @@
 use core::array::{SpanTrait, SpanIter};
-use orion_algo::span_math::SpanMathTrait;
 use orion_numbers::FixedTrait;
+use orion_data_structures::SpanMathTrait;
 
 /// Computes the cumulative distribution function (CDF) for a given set of values using the
 /// standard normal distribution formula. This implementation allows for optional location (`loc`)

diff --git a/packages/algo/src/algo/linear_fit.cairo b/packages/algo/src/algo/linear_fit.cairo
@@ -1,4 +1,4 @@
-use orion_algo::span_math::SpanMathTrait;
+use orion_data_structures::SpanMathTrait;
 use orion_numbers::FixedTrait;
 
 /// Performs a linear least squares fitting to provided data points. This function calculates

diff --git a/packages/algo/src/lib.cairo b/packages/algo/src/lib.cairo
@@ -1,2 +1 @@
-pub mod span_math;
 pub mod algo;
diff --git a/packages/data_structures/Scarb.toml b/packages/data_structures/Scarb.toml
@@ -0,0 +1,15 @@
+[package]
+name = "orion_data_structures"
+version = "0.1.0"
+edition = "2023_11"
+
+# See more keys and their definitions at https://docs.swmansion.com/scarb/docs/reference/manifest.html
+
+[dev-dependencies]
+cairo_test = "2.7.0"
+
+[dependencies]
+orion_numbers = { path = "../numbers" }
+
+[cairo]
+enable-gas=false
diff --git a/packages/data_structures/src/lib.cairo b/packages/data_structures/src/lib.cairo
@@ -0,0 +1,3 @@
+pub mod span;
+
+pub use {span::FixedSpanMath, span::SpanMathTrait};
diff --git a/packages/data_structures/src/span.cairo b/packages/data_structures/src/span.cairo
@@ -0,0 +1,14 @@
+pub mod span_fixed;
+
+use orion_numbers::FixedTrait;
+
+pub use span_fixed::FixedSpanMath;
+
+pub trait SpanMathTrait<T> {
+    fn arange(n: u32) -> Span<T>;
+    fn dot(self: Span<T>, other: Span<T>) -> T;
+    fn max(self: Span<T>) -> T;
+    fn min(self: Span<T>) -> T;
+    fn prod(self: Span<T>) -> T;
+    fn sum(self: Span<T>) -> T;
+}
diff --git a/packages/algo/src/span_math/span_fixed.cairo → ...data_structures/src/span/span_fixed.cairo b/packages/algo/src/span_math/span_fixed.cairo → ...data_structures/src/span/span_fixed.cairo
@@ -2,7 +2,7 @@ use core::ops::AddAssign;
 
 use orion_numbers::{FixedTrait};
 
-use orion_algo::span_math::SpanMathTrait;
+use super::SpanMathTrait;
 
 
 pub impl FixedSpanMath<

diff --git a/packages/ml/.tool-versions b/packages/ml/.tool-versions
diff --git a/packages/numbers/.tool-versions b/packages/numbers/.tool-versions
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,3 @@
		pub mod span;

		pub use {span::FixedSpanMath, span::SpanMathTrait};