Merge branch 'hw2' of github.com:themultiplexer/bsys-ws17-grp11 into hw2

hw2/task2/Cargo.toml

@@ -0,0 +1,10 @@
+[package]
+name = "task2"
+version = "0.1.0"
+authors = ["Joshua Rutschmann <joshua.rutschmann@gmx.de>"]
+
+[dependencies]
+
+[[bin]]
+doc = false
+name = "task2"

hw2/task2/src/lib.rs

@@ -0,0 +1,86 @@
+/// a struct to hold all of our configuration
+#[derive(Debug, PartialEq)]
+pub struct Config {
+    pub search: char,
+    pub line: String,
+}
+
+pub fn run(conf: &Config) -> i32 {
+    let mut count = 0;
+    for c in conf.line.chars() {
+        if c == conf.search {
+            count = count + 1;
+        }
+    }
+    count
+}
+
+/// Parses relevant arguments, returning the filled Config in Result
+///
+///
+/// This function will parse the relevant arguments from the
+/// given <Strings>.
+/// Returns Config or Error Message in Result
+#[allow(dead_code)]
+fn parse_arguments(args: &Vec<String>) -> Result<Config, String> {
+
+    if args.len() < 3 {
+        return Err("not ennugh parameters".to_string());
+    }
+
+    match args[1].chars().nth(0) {
+        Some(value) => {
+            Ok(Config {
+                search: value,
+                line: args[2].clone(),
+            })
+        }
+        None => Err("char mismatch".to_string()),
+    }
+}
+
+/// Parses relevant arguments, returning the filled Config
+///
+///
+/// This function will parse the relevant arguments from the
+/// given <Strings>.
+/// Returns Config
+#[allow(dead_code)]
+fn parse_arguments_simple(args: &Vec<String>) -> Config {
+    Config {
+        search: args[1].chars().nth(0).unwrap(),
+        line: args[2].clone(),
+    }
+}
+
+/// Prints elements of Vec
+///
+///
+/// This function will print all elements of Vec with "args found: <elem>" in
+/// each line
+///
+/// Returns nothing
+#[allow(dead_code)]
+fn print_arguments(args: &Vec<String>) {
+    for s in args {
+        println!("args found: {}", s);
+    }
+}
+
+impl Config {
+    pub fn new(args: &Vec<String>) -> Result<Config, &str> {
+        if args.len() < 3 {
+            return Err("not enough arguments");
+        }
+
+        match args[1].chars().nth(0) {
+            Some(value) => {
+                Ok(Config {
+                    search: value,
+                    line: args[2].clone(),
+                })
+            }
+            None => Err("char mismatch"),
+        }
+    }
+}

hw2/task2/src/main.rs

@@ -0,0 +1,28 @@
+use std::env;
+use std::process;
+use task2::Config;
+extern crate task2;
+
+fn main() {
+    let args = env::args().collect();
+
+    let res = Config::new(&args);
+    match res {
+        Ok(conf) => {
+            println!(
+                "You asked me to count all '{}' in '{}'",
+                conf.search,
+                conf.line
+            );
+            let occ = task2::run(&conf);
+            println!("Found {} '{}' in '{}'", occ, conf.search, conf.line);
+        }
+        Err(message) => {
+            println!("{}", message);
+            process::exit(1)
+        }
+    }
+
+
+
+}

hw2/task3/src/lib.rs

@@ -1,3 +1,4 @@
+
 #[cfg(test)]
 mod tests {
     #[test]
@@ -5,14 +6,40 @@ mod tests {
         assert_eq!(2 + 2, 4);
     }
 }
+
 pub struct PascalsTriangle {
     height: u32,
 }
 
 impl PascalsTriangle {
-    pub fn new(i:u32) {
-        height = i;
+    pub fn new(i: u32) -> Self {
+        PascalsTriangle { height: i }
     }
-    pub fn rows() -> Vec<Vec<u32>> {
+    pub fn rows(&self) -> Vec<Vec<u32>> {
+        let rows = self.height as usize;
+        let mut matrix = Vec::with_capacity(rows);
+
+        for line in 0..rows {
+            let current = line as usize;
+            matrix.push(Vec::with_capacity(current + 1));
+            matrix[current].push(1);
+
+            if current > 1 {
+                let previous = current - 1;
+                for index in 1..current {
+                    let add = matrix[previous][index - 1] + matrix[previous][index];
+                    matrix[current].push(add);
+                }
+            }
+
+            if current > 0 {
+                matrix[current].push(1);
+            }
+
+        }
+
+        println!("{:?}", matrix);
+
+        matrix
     }
 }

hw2/task3/src/main.rs

@@ -0,0 +1,7 @@
+extern crate task3;
+use task3::PascalsTriangle;
+
+fn main() {
+    let p = PascalsTriangle::new(10);
+    p.rows();
+}