From e7a50d7009a028088937dbcebd638233b7c00e62 Mon Sep 17 00:00:00 2001
From: natrixaeria <upezu@student.kit.edu>
Date: Fri, 20 Dec 2019 06:31:02 +0100
Subject: Fix `calculate_row`

---
 src/main.rs    | 2 +-
 src/solvers.rs | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main.rs b/src/main.rs
index d698bd6..9f15fd8 100644
--- a/src/main.rs
+++ b/src/main.rs
@@ -3,5 +3,5 @@ mod solvers;
 fn main() {
     let mut solver = solvers::Solver::<u8>::new(2);
     let wall = solver.solve();
-    wall.output(solver.w, solver.h);
+    wall.output(solver.n, solver.h);
 }
diff --git a/src/solvers.rs b/src/solvers.rs
index 99cbba7..9bf0ad6 100644
--- a/src/solvers.rs
+++ b/src/solvers.rs
@@ -18,9 +18,9 @@ impl Wall {
     }
 
     pub fn calculate_row(&self, r: u32, stones: &mut [u32]) {
-        let mut len = 0;
+        let mut len = 1;
         let mut i = 0;
-        for &height in self.heights.iter() {
+        for &height in self.heights.iter().chain([r].iter()) {
             if height == r {
                 stones[i] = len;
                 i += 1;
@@ -30,8 +30,8 @@ impl Wall {
         }
     }
 
-    pub fn output(&self, w: u32, h: u32) {
-        let mut stones = vec![0; w as usize];
+    pub fn output(&self, n: u32, h: u32) {
+        let mut stones = vec![0; n as usize];
         for row in 0..h {
             self.calculate_row(row, &mut stones);
             for &len in stones.iter() {
-- 
cgit v1.2.3-54-g00ecf