Skip to content

Commit

Permalink
chore: format memory_slice.rs
Browse files Browse the repository at this point in the history
  • Loading branch information
@neuodev
neuodev committed Dec 8, 2023
1 parent 523f938 commit e648d79
Showing 1 changed file with 41 additions and 28 deletions.
69 changes: 41 additions & 28 deletions program_structure/src/utils/memory_slice.rs
View file
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
use num_bigint_dig::BigInt;
use std::fmt::{Display, Formatter};

pub enum TypeInvalidAccess{
pub enum TypeInvalidAccess {
MissingInputs(String),
MissingInputTags(String),
NoInitializedComponent,
NoInitializedSignal
NoInitializedSignal,
}

pub enum TypeAssignmentError{
pub enum TypeAssignmentError {
MultipleAssignments,
AssignmentOutput
AssignmentOutput,
}

pub enum MemoryError {
Expand All @@ -26,7 +26,7 @@ pub enum MemoryError {
AssignmentTagInputTwice(String, String),
AssignmentTagInput,
TagValueNotInitializedAccess,
MissingInputs(String)
MissingInputs(String),
}
pub type SliceCapacity = usize;
pub type SimpleSlice = MemorySlice<BigInt>;
Expand All @@ -44,7 +44,11 @@ pub struct MemorySlice<C> {

impl<C: Clone> Clone for MemorySlice<C> {
fn clone(&self) -> Self {
MemorySlice { route: self.route.clone(), values: self.values.clone(), number_inserts: self.number_inserts}
MemorySlice {
route: self.route.clone(),
values: self.values.clone(),
number_inserts: self.number_inserts,
}
}
}

Expand All @@ -71,7 +75,6 @@ impl<C: Clone> MemorySlice<C> {
memory_slice: &MemorySlice<C>,
access: &[SliceCapacity],
) -> Result<SliceCapacity, MemoryError> {

if access.len() > memory_slice.route.len() {
return Result::Err(MemoryError::OutOfBoundsError);
}
Expand All @@ -95,13 +98,12 @@ impl<C: Clone> MemorySlice<C> {
new_values: &MemorySlice<C>,
is_strict: bool,
) -> Result<(), MemoryError> {

if access.len() + new_values.route.len() > memory_slice.route.len() {
return Result::Err(MemoryError::OutOfBoundsError);
}

let mut i: SliceCapacity = 0;

while i < access.len() {
if access[i] >= memory_slice.route[i] {
return Result::Err(MemoryError::OutOfBoundsError);
Expand All @@ -114,14 +116,26 @@ impl<C: Clone> MemorySlice<C> {

while i < new_values.route.len() {
if new_values.route[i] < memory_slice.route[initial_index_new + i] {
if is_strict{ // case signals: we do not allow
return Result::Err(MemoryError::MismatchedDimensions(new_values.route[i], memory_slice.route[initial_index_new + i]));
} else{ // case variables: we allow the assignment of smaller arrays
return Result::Err(MemoryError::MismatchedDimensionsWeak(new_values.route[i], memory_slice.route[initial_index_new + i]));
// case signals: we do not allow
if is_strict {
return Result::Err(MemoryError::MismatchedDimensions(
new_values.route[i],
memory_slice.route[initial_index_new + i],
));
}

// case variables: we allow the assignment of smaller arrays
return Result::Err(MemoryError::MismatchedDimensionsWeak(
new_values.route[i],
memory_slice.route[initial_index_new + i],
));
}

if new_values.route[i] > memory_slice.route[initial_index_new + i] {
return Result::Err(MemoryError::MismatchedDimensions(new_values.route[i], memory_slice.route[initial_index_new + i]));
return Result::Err(MemoryError::MismatchedDimensions(
new_values.route[i],
memory_slice.route[initial_index_new + i],
));
}
i += 1;
}
Expand Down Expand Up @@ -193,24 +207,24 @@ impl<C: Clone> MemorySlice<C> {
memory_slice: &mut MemorySlice<C>,
access: &[SliceCapacity],
new_values: &MemorySlice<C>,
is_strict:bool,
is_strict: bool,
) -> Result<(), MemoryError> {
match MemorySlice::check_correct_dims(memory_slice, access, new_values, is_strict){
match MemorySlice::check_correct_dims(memory_slice, access, new_values, is_strict) {
Result::Ok(_) => {
let mut cell = MemorySlice::get_initial_cell(memory_slice, access)?;

// if MemorySlice::get_number_of_cells(new_values)
// > (MemorySlice::get_number_of_cells(memory_slice) - cell)
// {
// return Result::Err(MemoryError::OutOfBoundsError);
memory_slice.number_inserts += MemorySlice::get_number_of_cells(new_values);

memory_slice.number_inserts += MemorySlice::get_number_of_cells(new_values);
for value in new_values.values.iter() {
memory_slice.values[cell] = value.clone();
cell += 1;
}
Result::Ok(())
},
}
Result::Err(MemoryError::MismatchedDimensionsWeak(dim_1, dim_2)) => {
let mut cell = MemorySlice::get_initial_cell(memory_slice, access)?;
// if MemorySlice::get_number_of_cells(new_values)
Expand All @@ -223,7 +237,7 @@ impl<C: Clone> MemorySlice<C> {
cell += 1;
}
Result::Err(MemoryError::MismatchedDimensionsWeak(dim_1, dim_2))
},
}
Result::Err(error) => return Err(error),
}
}
Expand All @@ -232,7 +246,7 @@ impl<C: Clone> MemorySlice<C> {
memory_slice: &mut MemorySlice<C>,
index: usize,
new_value: C,
)-> Result<(), MemoryError> {
) -> Result<(), MemoryError> {
if index > MemorySlice::get_number_of_cells(memory_slice) {
return Result::Err(MemoryError::OutOfBoundsError);
}
Expand All @@ -244,16 +258,15 @@ impl<C: Clone> MemorySlice<C> {
pub fn get_access_index(
memory_slice: &MemorySlice<C>,
index: usize,
) -> Result<Vec<SliceCapacity>, MemoryError>{
) -> Result<Vec<SliceCapacity>, MemoryError> {
let mut number_cells = MemorySlice::get_number_of_cells(memory_slice);
if index > number_cells {
return Result::Err(MemoryError::OutOfBoundsError);
}
else{
} else {
let mut access = vec![];
let mut index_aux = index;
for pos in &memory_slice.route{
number_cells = number_cells/pos;
for pos in &memory_slice.route {
number_cells = number_cells / pos;
access.push(index_aux / number_cells);
index_aux = index_aux % number_cells;
}
Expand All @@ -270,7 +283,7 @@ impl<C: Clone> MemorySlice<C> {
pub fn access_value_by_index(
memory_slice: &MemorySlice<C>,
index: usize,
)-> Result<C, MemoryError> {
) -> Result<C, MemoryError> {
if index > MemorySlice::get_number_of_cells(memory_slice) {
return Result::Err(MemoryError::OutOfBoundsError);
}
Expand Down Expand Up @@ -381,7 +394,7 @@ mod tests {
let mut slice = U32Slice::new_with_route(&route, &0);
let new_row = U32Slice::new_with_route(&[4], &4);

let res = U32Slice::insert_values(&mut slice, &[2], &new_row);
let res = U32Slice::insert_values(&mut slice, &[2], &new_row, false);
if let Result::Ok(_) = res {
for c in 0..4 {
let memory_result = U32Slice::get_reference_to_single_value(&slice, &[2, c]);
Expand Down

0 comments on commit e648d79

Please sign in to comment.