Skip to content

Commit 25abfbc

Browse files
committed
clone
1 parent 733b9aa commit 25abfbc

6 files changed

Lines changed: 169 additions & 40 deletions

File tree

‎src/bin/score.rs‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
use clap::{App, Arg};
22
use icfpc::models::*;
33
use icfpc::parse::read_all_inputs;
4+
use icfpc::parse::read_commands;
45
use icfpc::utils::Matrix;
56
use std::fs::File;
67
use std::io::Read;
@@ -40,7 +41,7 @@ impl ScoreInfo {
4041
}
4142
}
4243

43-
fn score_small(task: Task, output_len: usize) -> ScoreInfo {
44+
fn score_small(task: Task, commands: Commands) -> ScoreInfo {
4445
let map_points = task.map.enumerate_points();
4546

4647
let width = map_points.iter().map(|p| p.x).max().unwrap() + 1;
@@ -69,7 +70,7 @@ fn score_small(task: Task, output_len: usize) -> ScoreInfo {
6970
width: width as usize,
7071
height: height as usize,
7172
best_estimated: remaining * 3 / 5,
72-
team_time: output_len,
73+
team_time: commands.len(),
7374
}
7475
}
7576

@@ -95,14 +96,14 @@ fn main() {
9596

9697
let mut sum_scores = 0.0;
9798
for input in inputs {
98-
let output_len = {
99+
let commands = {
99100
let output_path = format!("{}/{}", output_root, input.output_file_name());
100101
let mut output_file = File::open(&output_path).unwrap();
101102
let mut output_str = String::new();
102103
output_file.read_to_string(&mut output_str).unwrap();
103-
output_str.trim_end().len()
104+
read_commands(&output_str)
104105
};
105-
let score_info = score_small(input.task, output_len);
106+
let score_info = score_small(input.task, commands);
106107
eprintln!("{}: {}", input.id, score_info.debug());
107108
sum_scores += score_info.score();
108109
}

‎src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ use icfpc::parse::read_all_inputs;
99
use icfpc::solve::solve_small_while;
1010

1111
fn solve<W: Write>(task: Task, f: &mut W) {
12-
let cmds = solve_small_while(task, std::time::Duration::from_secs(2));
12+
let cmds = solve_small_while(task, std::time::Duration::from_millis(100));
1313
write!(f, "{}", cmds).unwrap();
1414
}
1515

‎src/mine.rs‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
use jsonrpc_client_http::{HttpHandle, HttpTransport};
2-
use rand::prelude::*;
32
use serde::{Deserialize, Serialize};
43
use serde_json::Value;
5-
use std::collections::{HashMap, HashSet, VecDeque};
64
use std::{thread, time};
75

86
use crate::models::*;

‎src/models.rs‎

Lines changed: 54 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ impl Point {
3636
Move::MoveDown => Point::new(x, y - 1),
3737
Move::MoveRight => Point::new(x + 1, y),
3838
Move::MoveLeft => Point::new(x - 1, y),
39-
_ => self,
39+
Move::Noop => Point::new(x, y),
4040
}
4141
}
4242

@@ -47,7 +47,7 @@ impl Point {
4747
Move::MoveDown => Point::new(x, y + 1),
4848
Move::MoveRight => Point::new(x - 1, y),
4949
Move::MoveLeft => Point::new(x + 1, y),
50-
_ => unreachable!(),
50+
Move::Noop => Point::new(x, y),
5151
}
5252
}
5353
}
@@ -62,7 +62,15 @@ pub struct Map(pub Vec<Point>);
6262

6363
impl fmt::Display for Map {
6464
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
65-
write!(f, "{}", self.0.iter().map(|p| format!("{}", p)).collect::<Vec<_>>().join(","))?;
65+
write!(
66+
f,
67+
"{}",
68+
self.0
69+
.iter()
70+
.map(|p| format!("{}", p))
71+
.collect::<Vec<_>>()
72+
.join(",")
73+
)?;
6674
Ok(())
6775
}
6876
}
@@ -129,6 +137,10 @@ impl Map {
129137
pub fn len(&self) -> usize {
130138
self.0.len()
131139
}
140+
141+
pub fn is_empty(&self) -> bool {
142+
self.0.is_empty()
143+
}
132144
}
133145

134146
#[derive(Debug, Clone, Eq, PartialEq)]
@@ -186,13 +198,28 @@ impl fmt::Display for Task {
186198
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
187199
write!(f, "{}#", self.map)?;
188200
write!(f, "{}#", self.initial)?;
189-
write!(f, "{}#", self.obstacles.iter().map(|o| format!("{}", o)).collect::<Vec<_>>().join(";"))?;
190-
write!(f, "{}", self.boosters.iter().map(|b| format!("{}", b)).collect::<Vec<_>>().join(";"))?;
201+
write!(
202+
f,
203+
"{}#",
204+
self.obstacles
205+
.iter()
206+
.map(|o| format!("{}", o))
207+
.collect::<Vec<_>>()
208+
.join(";")
209+
)?;
210+
write!(
211+
f,
212+
"{}",
213+
self.boosters
214+
.iter()
215+
.map(|b| format!("{}", b))
216+
.collect::<Vec<_>>()
217+
.join(";")
218+
)?;
191219
Ok(())
192220
}
193221
}
194222

195-
196223
#[derive(Debug, Clone, Eq, PartialEq)]
197224
pub enum Move {
198225
MoveUp,
@@ -212,6 +239,7 @@ pub enum Command {
212239
Drill,
213240
ResetBeacon,
214241
ShiftBeacon(Point),
242+
Cloning,
215243
}
216244

217245
impl fmt::Display for Command {
@@ -224,11 +252,12 @@ impl fmt::Display for Command {
224252
Command::Move(Move::Noop) => write!(f, "Z"),
225253
Command::TurnRight => write!(f, "E"),
226254
Command::TurnLeft => write!(f, "Q"),
227-
Command::NewHand(p) => write!(f, "B({}, {})", p.x, p.y),
255+
Command::NewHand(p) => write!(f, "B({},{})", p.x, p.y),
228256
Command::FastWheel => write!(f, "F"),
229257
Command::Drill => write!(f, "L"),
230258
Command::ResetBeacon => write!(f, "R"),
231-
Command::ShiftBeacon(p) => write!(f, "T({}, {})", p.x, p.y),
259+
Command::ShiftBeacon(p) => write!(f, "T({},{})", p.x, p.y),
260+
Command::Cloning => write!(f, "C"),
232261
}
233262
}
234263
}
@@ -260,12 +289,26 @@ impl Commands {
260289
pub fn len(&self) -> usize {
261290
self.0[0].len()
262291
}
292+
pub fn is_empty(&self) -> bool {
293+
self.0[0].is_empty()
294+
}
263295
}
264296

265297
impl fmt::Display for Commands {
266298
fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
267-
write!(f, "{}", self.0.iter().map(|cmds| {
268-
cmds.iter().map(|c| format!("{}", c)).collect::<Vec<_>>().join("")
269-
}).collect::<Vec<_>>().join("#"))
299+
write!(
300+
f,
301+
"{}",
302+
self.0
303+
.iter()
304+
.map(|cmds| {
305+
cmds.iter()
306+
.map(|c| format!("{}", c))
307+
.collect::<Vec<_>>()
308+
.join("")
309+
})
310+
.collect::<Vec<_>>()
311+
.join("#")
312+
)
270313
}
271314
}

‎src/parse.rs‎

Lines changed: 61 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
use crate::models::*;
22
use glob::glob;
3-
use std::convert::TryFrom;
43
use std::fs::File;
54
use std::io::Read;
65
use std::iter::Peekable;
@@ -51,8 +50,28 @@ fn skip_or_empty(iter: &mut Peekable<Chars>, expected: char) {
5150
}
5251
}
5352

53+
fn read_i32(iter: &mut Peekable<Chars>, last: char) -> i32 {
54+
let mut x = 0i32;
55+
let minus = if let Some('-') = iter.peek() {
56+
iter.next();
57+
true
58+
} else {
59+
false
60+
};
61+
loop {
62+
let c = iter.next().unwrap();
63+
if c.is_digit(10) {
64+
x = x * 10 + i32::from(c as u8 - b'0');
65+
} else {
66+
assert!(c == last);
67+
return if minus { -x } else { x };
68+
}
69+
}
70+
}
71+
5472
fn read_usize(iter: &mut Peekable<Chars>, last: char) -> usize {
5573
let mut x = 0usize;
74+
assert!(*iter.peek().unwrap() == '-');
5675
loop {
5776
let c = iter.next().unwrap();
5877
if c.is_digit(10) {
@@ -66,9 +85,9 @@ fn read_usize(iter: &mut Peekable<Chars>, last: char) -> usize {
6685

6786
fn read_point(iter: &mut Peekable<Chars>) -> Point {
6887
skip(iter, '(');
69-
let x = read_usize(iter, ',');
70-
let y = read_usize(iter, ')');
71-
Point::new(i32::try_from(x).unwrap(), i32::try_from(y).unwrap())
88+
let x = read_i32(iter, ',');
89+
let y = read_i32(iter, ')');
90+
Point::new(x, y)
7291
}
7392

7493
fn read_map_internal(mut iter: &mut Peekable<Chars>) -> (Map, char) {
@@ -150,6 +169,44 @@ pub fn read_task(s: &str) -> Task {
150169
}
151170
}
152171

172+
fn read_command_internal(iter: &mut Peekable<Chars>) -> Vec<Command> {
173+
let mut res = Vec::new();
174+
while let Some(c) = iter.next() {
175+
let cmd = match c {
176+
'W' => Command::Move(Move::MoveUp),
177+
'S' => Command::Move(Move::MoveDown),
178+
'A' => Command::Move(Move::MoveLeft),
179+
'D' => Command::Move(Move::MoveRight),
180+
'Z' => Command::Move(Move::Noop),
181+
'E' => Command::TurnRight,
182+
'Q' => Command::TurnLeft,
183+
'B' => {
184+
let p = read_point(iter);
185+
Command::NewHand(p)
186+
}
187+
'F' => Command::FastWheel,
188+
'L' => Command::Drill,
189+
'R' => Command::ResetBeacon,
190+
'T' => {
191+
let p = read_point(iter);
192+
Command::ShiftBeacon(p)
193+
}
194+
'C' => Command::Cloning,
195+
_ => unreachable!(),
196+
};
197+
res.push(cmd);
198+
}
199+
res
200+
}
201+
202+
fn read_command(s: &str) -> Vec<Command> {
203+
read_command_internal(&mut s.chars().peekable())
204+
}
205+
206+
pub fn read_commands(s: &str) -> Commands {
207+
Commands::new(s.split('#').map(|s| read_command(&s)).collect::<Vec<_>>())
208+
}
209+
153210
fn find_files(input_root: &str) -> Vec<String> {
154211
glob(&format!("{}/prob-*.desc", input_root))
155212
.expect("glob pattern")

0 commit comments

Comments
 (0)