Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions jlopez/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
*.pyc
49 changes: 49 additions & 0 deletions jlopez/add.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
import re


INIT_DELIMITER = r'^//'
DELIMITER_RE = r'\[?([^]]+)\]?'


def add(input_string=""):
if not input_string or len(input_string) == 0:
return 0

delimiters = []
(first_line, _a, number_list) = input_string.partition("\n")
if len(number_list) == 0:
number_list = first_line
delimiters = [","]
else:
init_re = re.compile(INIT_DELIMITER)
delimiter_re = re.compile(DELIMITER_RE)

result = init_re.match(first_line)
if result:
delimiters_string = init_re.sub("",first_line)
for delimiter in delimiter_re.findall(delimiters_string):
delimiters.append(re.escape(delimiter))
else:
# No delimiter set
delimiters = [","]
number_list = first_line + "\n" + number_list

delimiter_re = re.compile("|".join(delimiters))

numbers = []
for line in number_list.split("\n"):
numbers += delimiter_re.split(line)

result = 0
for number in numbers:
number = int(number)
if number < 0:
raise NegativeNumberException
if number <= 1000:
result += int(number)

return result



class NegativeNumberException(Exception): "no negative"
44 changes: 44 additions & 0 deletions jlopez/add_test.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
#!/usr/bin/python

import unittest
from add import add, NegativeNumberException

class TestAdd(unittest.TestCase):

def test_empty(self):
self.assertEqual(0, add())
self.assertEqual(0, add(""))
self.assertEqual(0, add(None))

def test_one(self):
self.assertEqual(2, add("2"))

def test_two(self):
self.assertEqual(3, add("1,2"))

def test_many(self):
self.assertEqual(10, add("1,2,3,4"))

def test_newline(self):
self.assertEqual(10, add("1,2\n3\n4"))

def test_delimiter(self):
self.assertEqual(10, add("//;\n1;2\n3;4"))

def test_negatives(self):
self.assertRaises(NegativeNumberException, add, "1,2,-3")

def test_one_hundred(self):
self.assertEqual(2, add("2,1001"))
self.assertEqual(1002, add("2,1000"))

def test_long_delimiter(self):
self.assertEqual(10, add("//[...]\n1...2...3...4"))

def test_multiple_delimiters(self):
self.assertEqual(10, add("//[..][oo]\n1..2\n3oo4"))
self.assertEqual(20, add("//[..][oo]\n1..2\n3oo4..10"))

if __name__ == '__main__':
unittest.main()