Refile for merging repos

4 files changed, 0 insertions, 264 deletions

diff --git a/aoc12/Cargo.lock b/aoc12/Cargo.lock
deleted file mode 100644
index 24237f4..0000000
--- a/aoc12/Cargo.lock
+++ /dev/null
@@ -1,98 +0,0 @@
-[root]
-name = "aoc12"
-version = "0.1.0"
-dependencies = [
- "regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "aho-corasick"
-version = "0.5.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "kernel32-sys"
-version = "0.2.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)",
- "winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "libc"
-version = "0.2.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "memchr"
-version = "0.1.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "regex"
-version = "0.1.80"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)",
- "memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)",
- "regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)",
- "thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)",
- "utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "regex-syntax"
-version = "0.3.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "thread-id"
-version = "2.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)",
- "libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "thread_local"
-version = "0.2.7"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-dependencies = [
- "thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
-]
-
-[[package]]
-name = "utf8-ranges"
-version = "0.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi"
-version = "0.2.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[[package]]
-name = "winapi-build"
-version = "0.1.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-
-[metadata]
-"checksum aho-corasick 0.5.3 (registry+https://github.com/rust-lang/crates.io-index)" = "ca972c2ea5f742bfce5687b9aef75506a764f61d37f8f649047846a9686ddb66"
-"checksum kernel32-sys 0.2.2 (registry+https://github.com/rust-lang/crates.io-index)" = "7507624b29483431c0ba2d82aece8ca6cdba9382bff4ddd0f7490560c056098d"
-"checksum libc 0.2.18 (registry+https://github.com/rust-lang/crates.io-index)" = "a51822fc847e7a8101514d1d44e354ba2ffa7d4c194dcab48870740e327cac70"
-"checksum memchr 0.1.11 (registry+https://github.com/rust-lang/crates.io-index)" = "d8b629fb514376c675b98c1421e80b151d3817ac42d7c667717d282761418d20"
-"checksum regex 0.1.80 (registry+https://github.com/rust-lang/crates.io-index)" = "4fd4ace6a8cf7860714a2c2280d6c1f7e6a413486c13298bbc86fd3da019402f"
-"checksum regex-syntax 0.3.9 (registry+https://github.com/rust-lang/crates.io-index)" = "f9ec002c35e86791825ed294b50008eea9ddfc8def4420124fbc6b08db834957"
-"checksum thread-id 2.0.0 (registry+https://github.com/rust-lang/crates.io-index)" = "a9539db560102d1cef46b8b78ce737ff0bb64e7e18d35b2a5688f7d097d0ff03"
-"checksum thread_local 0.2.7 (registry+https://github.com/rust-lang/crates.io-index)" = "8576dbbfcaef9641452d5cf0df9b0e7eeab7694956dd33bb61515fb8f18cfdd5"
-"checksum utf8-ranges 0.1.3 (registry+https://github.com/rust-lang/crates.io-index)" = "a1ca13c08c41c9c3e04224ed9ff80461d97e121589ff27c753a16cb10830ae0f"
-"checksum winapi 0.2.8 (registry+https://github.com/rust-lang/crates.io-index)" = "167dc9d6949a9b857f3451275e911c3f44255842c1f7a76f33c55103a909087a"
-"checksum winapi-build 0.1.1 (registry+https://github.com/rust-lang/crates.io-index)" = "2d315eee3b34aca4797b2da6b13ed88266e6d612562a0c46390af8299fc699bc"
diff --git a/aoc12/Cargo.toml b/aoc12/Cargo.toml
deleted file mode 100644
index f224921..0000000
--- a/aoc12/Cargo.toml
+++ /dev/null
@@ -1,7 +0,0 @@
-[package]
-name = "aoc12"
-version = "0.1.0"
-authors = ["Justin Worthe <justin.worthe@entelect.co.za>"]
-
-[dependencies]
-regex = "0.1"
\ No newline at end of file
diff --git a/aoc12/input.txt b/aoc12/input.txt
deleted file mode 100644
index bb2a2ff..0000000
--- a/aoc12/input.txt
+++ /dev/null
@@ -1,23 +0,0 @@
-cpy 1 a
-cpy 1 b
-cpy 26 d
-jnz c 2
-jnz 1 5
-cpy 7 c
-inc d
-dec c
-jnz c -2
-cpy a c
-inc a
-dec b
-jnz b -2
-cpy c b
-dec d
-jnz d -6
-cpy 17 c
-cpy 18 d
-inc a
-dec d
-jnz d -2
-dec c
-jnz c -5
diff --git a/aoc12/src/main.rs b/aoc12/src/main.rs
deleted file mode 100644
index 2356402..0000000
--- a/aoc12/src/main.rs
+++ /dev/null
@@ -1,136 +0,0 @@
-extern crate regex;
-use regex::Regex;
-
-use std::io::BufReader;
-use std::io::prelude::*;
-use std::fs::File;
-
-enum Instruction {
-    CpyLit(i32, usize),
-    CpyReg(usize, usize),
-    Inc(usize),
-    Dec(usize),  
-    Jnz(usize, i32),
-    Jmp(i32),
-    Noop
-}
-
-impl Instruction {
-    fn parse(line: &str) -> Instruction {
-        let cpy_lit: Regex = Regex::new(r"cpy ([-\d]+) (a|b|c|d)").unwrap();
-        let cpy_reg = Regex::new(r"cpy (a|b|c|d) (a|b|c|d)").unwrap();
-        let inc = Regex::new(r"inc (a|b|c|d)").unwrap();
-        let dec = Regex::new(r"dec (a|b|c|d)").unwrap();
-        let jnz_lit = Regex::new(r"jnz ([-\d]+) ([-\d]+)").unwrap();
-        let jnz_reg = Regex::new(r"jnz (a|b|c|d) ([-\d]+)").unwrap();
-
-        let cpy_lit_match = cpy_lit.captures(line);
-        let cpy_reg_match = cpy_reg.captures(line);
-        let inc_match = inc.captures(line);
-        let dec_match = dec.captures(line);
-        let jnz_lit_match = jnz_lit.captures(line);
-        let jnz_reg_match = jnz_reg.captures(line);
-        
-        if cpy_lit_match.is_some() {
-            let cap = cpy_lit_match.unwrap();
-            let src: i32 = cap.at(1).unwrap().parse().unwrap();
-            let dest = to_register_index(cap.at(2).unwrap());
-            Instruction::CpyLit(src, dest)
-        }
-        else if cpy_reg_match.is_some() {
-            let cap = cpy_reg_match.unwrap();
-            let src = to_register_index(cap.at(1).unwrap());
-            let dest = to_register_index(cap.at(2).unwrap());
-            Instruction::CpyReg(src, dest)
-        }
-        else if inc_match.is_some() {
-            let cap = inc_match.unwrap();
-            let dest = to_register_index(cap.at(1).unwrap());
-            Instruction::Inc(dest)
-        }
-        else if dec_match.is_some() {
-            let cap = dec_match.unwrap();
-            let dest = to_register_index(cap.at(1).unwrap());
-            Instruction::Dec(dest)
-        }
-        else if jnz_lit_match.is_some() {
-            let cap = jnz_lit_match.unwrap();
-            let condition: i32 = cap.at(1).unwrap().parse().unwrap();
-            let offset: i32 = cap.at(2).unwrap().parse().unwrap();
-            if condition != 0 {
-                Instruction::Jmp(offset)
-            }
-            else {
-                Instruction::Noop
-            }
-        }
-        else if jnz_reg_match.is_some() {
-            let cap = jnz_reg_match.unwrap();
-            let condition = to_register_index(cap.at(1).unwrap());
-            let offset: i32 = cap.at(2).unwrap().parse().unwrap();
-            Instruction::Jnz(condition, offset)
-        }
-        else {
-            panic!("Invalid instruction line")
-        }
-    }
-}
-
-fn main() {
-    let program = read_file();
-
-    let mut registers: [i32; 4] = [0, 0, 1, 0];
-    let mut pc: usize = 0;
-    
-    while pc < program.len() {
-        let mut pc_next: usize = pc+1;
-
-        match program[pc] {
-            Instruction::CpyLit(src, dest) => {
-                registers[dest] = src;
-            },
-            Instruction::CpyReg(src, dest) => {
-                registers[dest] = registers[src];
-            },
-            Instruction::Inc(dest) => {
-                registers[dest] += 1;
-            },
-            Instruction::Dec(dest) => {
-                registers[dest] -= 1;
-            },
-            Instruction::Jnz(condition, offset) => {
-                if registers[condition] != 0 {
-                    pc_next = (pc as i32 + offset) as usize;
-                }
-            },
-            Instruction::Jmp(offset) => {
-                pc_next = (pc as i32 + offset) as usize
-            },
-            Instruction::Noop => {}
-        }
-
-        pc = pc_next;
-    }
-    
-    println!("a: {}, b: {}, c: {}, d: {}", registers[0], registers[1], registers[2], registers[3]);
-    
-}
-
-fn to_register_index(name: &str) -> usize {
-    match name {
-        "a" => 0,
-        "b" => 1,
-        "c" => 2,
-        "d" => 3,
-        _ => panic!("Invalid register provided")
-    }
-}
-
-fn read_file() -> Vec<Instruction> {
-    let file = BufReader::new(File::open("input.txt").unwrap());
-    file.lines()
-        .map(|line| line.unwrap())
-        .filter(|line| line.len() > 0)
-        .map(|line| Instruction::parse(line.trim()))
-        .collect()
-}