Lab 2 formatting tweaks.

Java/lab_2/lab_2.java

@@ -1,5 +1,8 @@
 package OOP.Java.lab_2;
 
+import org.jetbrains.annotations.Contract;
+import org.jetbrains.annotations.NotNull;
+
 import java.util.Scanner;
 
 public class lab_2 {
@@ -23,13 +26,15 @@ public class lab_2 {
         return read_variable;
     }
 
+    @NotNull
     public static String format(int number) {
         int width = String.valueOf(number).length() + 1;
 
         return "|%" + width + "d ";
     }
 
-    public static double average(short[] row) {
+    @Contract(pure = true)
+    public static double average(@NotNull short[] row) {
         short sum = 0;
 
         for (short element : row) {

Rust/lab_2/Cargo.lock

@@ -5,3 +5,12 @@ version = 3
 [[package]]
 name = "lab_2"
 version = "0.1.0"
+dependencies = [
+ "text_io",
+]
+
+[[package]]
+name = "text_io"
+version = "0.1.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d5f0c8eb2ad70c12a6a69508f499b3051c924f4b1cfeae85bfad96e6bc5bba46"

Rust/lab_2/Cargo.toml

@@ -6,3 +6,4 @@ edition = "2021"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
+text_io = "0.1.12"

Rust/lab_2/src/main.rs

@@ -1,3 +1,140 @@
+// #[allow(dead_code)]
+fn capitalise(s: &str) -> String {
+    let mut c = s.chars();
+    match c.next() {
+        None => String::new(),
+        Some(f) => f.to_uppercase().collect::<String>() + c.as_str(),
+    }
+}
+
+fn read_row() -> Vec<i16> {
+    loop {
+        print!("Row (separated by spaces): ");
+        let raw_row: String = text_io::read!("{}\n");
+        let trimmed_row: &str = raw_row.trim();
+        match trimmed_row.split(" ").all(|value| {
+            value.chars().all(|char| char.is_numeric() || char == '-')
+                && value.parse::<i32>().unwrap() <= i16::MAX as i32
+                && value.parse::<i32>().unwrap() >= i16::MIN as i32
+        }) {
+            true => {
+                return trimmed_row
+                    .split(" ")
+                    .map(|value| value.parse::<i16>().unwrap())
+                    .collect::<Vec<i16>>()
+            }
+            false => println!("[Error] The row must consist of short integers, try again."),
+        }
+    }
+}
+
+fn generate_row(row_index: u16, length: u16) -> Vec<i16> {
+    return (0..length)
+        .map(|element_index| (element_index as i16 + 1) * (row_index as i16 + 1))
+        .collect();
+}
+
+fn read_matrix() -> Vec<Vec<i16>> {
+    let rows: u16 = protected_u16_read("the number of rows");
+    loop {
+        print!("Generate [s]quare or [r]ectangle matrix or [i]nput manually [s/r/i]: ");
+        let option: String = text_io::read!();
+        match option.to_lowercase().as_str() {
+            "s" => return (0..rows).map(|i| generate_row(i, rows)).collect(),
+            "r" => {
+                let columns: u16 = protected_u16_read("the number of columns");
+                return (0..rows).map(|i| generate_row(i, columns)).collect();
+            }
+            "i" => return (0..rows).map(|_| read_row()).collect(),
+            _ => println!("[Error] Not an option, try again."),
+        }
+    }
+}
+
+fn protected_u16_read(variable_name: &str) -> u16 {
+    use text_io::try_read;
+    loop {
+        print!("Enter {}: ", variable_name);
+        let read_result: Result<u16, _> = try_read!();
+        match read_result {
+            Ok(read_integer) => return read_integer,
+            Err(_e) => println!(
+                "{} must be a short integer, try again.",
+                capitalise(variable_name)
+            ),
+        }
+    }
+}
+
+fn multiply_matrix_by_number(matrix: &Vec<Vec<i16>>, multiplier: u16) -> Vec<Vec<i16>> {
+    return matrix
+        .iter()
+        .map(|row| {
+            row.iter()
+                .map(|element| element * multiplier as i16)
+                .collect()
+        })
+        .collect();
+}
+
+fn average_of_row(row: &Vec<i16>) -> f32 {
+    return row.iter().sum::<i16>() as f32 / row.len() as f32;
+}
+
+fn format_matrix(matrix: &Vec<Vec<i16>>) -> String {
+    let max_width = matrix
+        .iter()
+        .map(|row| {
+            row.iter()
+                .map(|element| element.to_string().len())
+                .max()
+                .unwrap()
+        })
+        .max()
+        .unwrap();
+
+    let mut formatted_matrix: String = matrix
+        .iter()
+        .map(|row| {
+            row.iter()
+                .map(|element| format!("| {:max_width$} ", element))
+                .collect::<Vec<String>>()
+                .join("")
+        })
+        .collect::<Vec<String>>()
+        .join("|\n");
+    formatted_matrix.push('|');
+    return formatted_matrix;
+}
+
+fn format_column(column: &Vec<f32>) -> String {
+    let max_width = column
+        .iter()
+        .map(|element| element.to_string().len())
+        .max()
+        .unwrap();
+
+    return column
+        .iter()
+        .map(|element| format!("| {:max_width$} |", element))
+        .collect::<Vec<String>>()
+        .join("\n");
+}
+
 fn main() {
-    println!("Hello, world!");
+    let full_vec_test: Vec<Vec<i16>> = read_matrix();
-}
+    println!("\nMatrix B:\n{}\n", format_matrix(&full_vec_test));
+
+    let mult_full_vec_test: Vec<Vec<i16>> =
+        multiply_matrix_by_number(&full_vec_test, protected_u16_read("matrix multiplier"));
+    println!("Matrix a×B:\n{}\n", format_matrix(&mult_full_vec_test));
+
+    let row_averages: Vec<f32> = mult_full_vec_test
+        .iter()
+        .map(|row| average_of_row(row))
+        .collect();
+    println!(
+        "Averages for each row in a×B:\n{}",
+        format_column(&row_averages)
+    );
+}