Support compu methods

DanielT · Aug 14, 2024 · ba3d314 · ba3d314
1 parent bdb8d86
commit ba3d314
Show file tree

Hide file tree

Showing 5 changed files with 1,279 additions and 30 deletions.
diff --git a/autosar-data-abstraction/src/communication/signal/mod.rs b/autosar-data-abstraction/src/communication/signal/mod.rs
@@ -511,16 +511,16 @@ reflist_iterator!(ISignalToIPduMappingsIterator, ISignalToIPduMapping);
 #[cfg(test)]
 mod tests {
     use super::*;
-    use crate::datatype::{BaseTypeEncoding, SwBaseType, Unit};
+    use crate::datatype::{BaseTypeEncoding, CompuMethodContent, SwBaseType, Unit};
     use autosar_data::{AutosarModel, AutosarVersion};
 
     #[test]
     fn test_signal() {
         let model = AutosarModel::new();
         let _file = model.create_file("test.arxml", AutosarVersion::LATEST).unwrap();
         let package = ArPackage::get_or_create(&model, "/test").unwrap();
-        let unit = Unit::new("unit", &package).unwrap();
-        let compu_method = CompuMethod::new("compu_method", &package).unwrap();
+        let unit = Unit::new("unit", &package, Some("Unit Name")).unwrap();
+        let compu_method = CompuMethod::new("compu_method", &package, CompuMethodContent::Identical).unwrap();
         let data_constr = DataConstr::new("data_constr", &package).unwrap();
         let sw_base_type =
             SwBaseType::new("sw_base_type", &package, 8, BaseTypeEncoding::None, None, None, None).unwrap();

diff --git a/autosar-data-abstraction/src/datatype/applicationtype.rs b/autosar-data-abstraction/src/datatype/applicationtype.rs
@@ -401,6 +401,7 @@ element_iterator!(ApplicationRecordElementIterator, ApplicationRecordElement, So
 mod tests {
     use super::*;
     use autosar_data::AutosarVersion;
+    use datatype::{CompuMethodContent, CompuMethodLinearContent};
 
     #[test]
     fn test_application_array_data_type() {
@@ -457,8 +458,20 @@ mod tests {
         let model = AutosarModel::new();
         let _file = model.create_file("filename", AutosarVersion::LATEST).unwrap();
         let package = ArPackage::get_or_create(&model, "/DataTypes").unwrap();
-        let compu_method = CompuMethod::new("CompuMethod", &package).unwrap();
-        let unit = Unit::new("Unit", &package).unwrap();
+        let compu_method = CompuMethod::new(
+            "CompuMethod",
+            &package,
+            CompuMethodContent::Linear(CompuMethodLinearContent {
+                direction: datatype::CompuScaleDirection::IntToPhys,
+                offset: 0.0,
+                factor: 100.0,
+                divisor: 1.0,
+                lower_limit: None,
+                upper_limit: None,
+            }),
+        )
+        .unwrap();
+        let unit = Unit::new("Unit", &package, Some("Unit name")).unwrap();
         let data_constraint = DataConstr::new("DataConstraint", &package).unwrap();
         let primitive_data_type = ApplicationPrimitiveDataType::new(
             "Primitive",