public/aoc2019
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: public:6f5e848c091d0be417335b43e18f0683d2c80f98
Branches Tags
public:master
public:day16
public:day15
public:day13
public:day14
public:day12
public:day10map
public:day9
..
compare: public:450a6b4f8af2ccbd2627c058e650b0eec4f78e05
Branches Tags
public:day16
public:master
public:day15
public:day13
public:day14
public:day12
public:day10map
public:day9

No commits in common. "6f5e848c091d0be417335b43e18f0683d2c80f98" and "450a6b4f8af2ccbd2627c058e650b0eec4f78e05" have entirely different histories.
6f5e848c09 ... 450a6b4f8a

2 changed files with 11 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

18
src/day14/main.rs
View file

@ -60,7 +60,7 @@ impl NanoFactory {
.collect(); .collect();
} }
self.ordered.reverse(); self.ordered.reverse();
self.ordered.retain(|res| res != "ORE"); self.ordered.pop();
} }
/// calculate how much ores are required for required_fuel /// calculate how much ores are required for required_fuel
@ -84,7 +84,6 @@ impl NanoFactory {
}); });
// return cost for ore // return cost for ore
println!("{:?}", storage);
*storage.get("ORE").unwrap() as usize *storage.get("ORE").unwrap() as usize
} }
@ -278,8 +277,7 @@ mod tests {
.trim() .trim()
.as_bytes(), .as_bytes(),
); );
let mut factory = NanoFactory::from(bufreader); let factory = NanoFactory::from(bufreader);
factory.resolve_order();
assert_eq!(factory.generate_fuel(), 31); assert_eq!(factory.generate_fuel(), 31);
assert_eq!(factory.resource_usage(1), 31); assert_eq!(factory.resource_usage(1), 31);
} }
@ -299,8 +297,7 @@ mod tests {
.trim() .trim()
.as_bytes(), .as_bytes(),
); );
let mut factory = NanoFactory::from(bufreader); let factory = NanoFactory::from(bufreader);
factory.resolve_order();
assert_eq!(factory.generate_fuel(), 165); assert_eq!(factory.generate_fuel(), 165);
assert_eq!(factory.resource_usage(1), 165); assert_eq!(factory.resource_usage(1), 165);
} }
@ -324,6 +321,7 @@ mod tests {
); );
let factory = NanoFactory::from(bufreader); let factory = NanoFactory::from(bufreader);
assert_eq!(factory.generate_fuel(), 13312); assert_eq!(factory.generate_fuel(), 13312);
assert_eq!(factory.generate_fuel_from_ores(1_000_000_000_000), 82892753);
} }
#[test] #[test]
@ -346,10 +344,10 @@ mod tests {
.trim() .trim()
.as_bytes(), .as_bytes(),
); );
let mut factory = NanoFactory::from(bufreader); let factory = NanoFactory::from(bufreader);
factory.resolve_order();
assert_eq!(factory.generate_fuel(), 180697); assert_eq!(factory.generate_fuel(), 180697);
assert_eq!(factory.resource_usage(1), 180697); assert_eq!(factory.resource_usage(1), 180697);
// TODO assert_eq!(factory.generate_fuel_from_ores(1_000_000_000_000), 5586022);
} }
#[test] #[test]
@ -377,9 +375,9 @@ mod tests {
.trim() .trim()
.as_bytes(), .as_bytes(),
); );
let mut factory = NanoFactory::from(bufreader); let factory = NanoFactory::from(bufreader);
factory.resolve_order();
assert_eq!(factory.generate_fuel(), 2210736); assert_eq!(factory.generate_fuel(), 2210736);
assert_eq!(factory.resource_usage(1), 2210736); assert_eq!(factory.resource_usage(1), 2210736);
// TODO assert_eq!(factory.generate_fuel_from_ores(1_000_000_000_000), 460664);
} }
} }

5
src/intcode.rs
View file

@ -319,8 +319,9 @@ impl Computer {
Mode::Immediate => want, Mode::Immediate => want,
Mode::Relative => (self.rel + self.get_pos(want)) as usize, Mode::Relative => (self.rel + self.get_pos(want)) as usize,
}; };
if length <= want { if length < want {
self.program.resize(want + 1, 0); let missing = (want - length) + 10000;
self.program.extend_from_slice(&vec![0; missing])
} }
self.program[want] = value; self.program[want] = value;
} }