Merge remote-tracking branch 'origin/master'

puRe1337 · Dec 5, 2017 · 061633a · 061633a
2 parents 5051976 + 878302f
commit 061633a
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/2017/README.md b/2017/README.md
@@ -3,9 +3,9 @@
 
 | | A | B | C | D | E | F | G | H | I | J | K | L | M | N | O | P | Q | R | S | T | U | V | W | Y
 |---|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|:---:|
-| Java | ✓ | ✓ |  |  | |  |  |  | |  | | | | | | | | | | | | | | | 
-| C++ | ✓ | ✓ |  |  | |  |  |  | |  | | | | | | | | | | | | | | |
-| Python | ✓ | ✓ | | | |  |  | | | | | | | | | | | | | | | | | |
+| Java | ✓ | ✓ |  | ✓ | |  |  |  | |  | | | | | | | | | | | | | | | 
+| C++ | ✓ | ✓ |  | ✓ | |  |  |  | |  | | | | | | | | | | | | | | |
+| Python | ✓ | ✓ | | ✓ | |  |  | | | | | | | | | | | | | | | | | |
 
 ✓ = completed
 ~ = failed to complete

diff --git a/2017/problem_d/problem_d.cpp b/2017/problem_d/problem_d.cpp
@@ -20,6 +20,7 @@ int main() {
 		if (snow_incr.find(current_line) == snow_incr.end())
 			return 1;
 		snow_height += snow_incr[current_line];
+		if(snow_height < 0) snow_height = 0;
 		std::cout << snow_height << std::endl;
 	}
 	return 1;

diff --git a/2017/problem_d/problem_d.py3 → 2017/problem_d/problem_d.py b/2017/problem_d/problem_d.py3 → 2017/problem_d/problem_d.py
@@ -12,4 +12,6 @@
     if curr_line == "end":
         break
     snow_height += snow_incr[curr_line]
+    if snow_height < 0:
+        snow_height = 0
     print(snow_height)