Merge pull request exercism#4 from exercism/master

merge in changes from main repo

Author: BethanyG

exercises/book-store/book_store.py

@@ -1,2 +1,2 @@
-defcalculate_total(books):
+deftotal(basket):
 pass

exercises/book-store/book_store_test.py

@@ -1,58 +1,58 @@
 importunittest
 
-frombook_storeimportcalculate_total
+frombook_storeimporttotal
 
 
 # Tests adapted from `problem-specifications//canonical-data.json` @ v1.4.0
 
 classBookStoreTest(unittest.TestCase):
 deftest_only_a_single_book(self):
-self.assertEqual(calculate_total([1]), 800)
+self.assertEqual(total([1]), 800)
 
 deftest_two_of_the_same_book(self):
-self.assertEqual(calculate_total([2, 2]), 1600)
+self.assertEqual(total([2, 2]), 1600)
 
 deftest_empty_basket(self):
-self.assertEqual(calculate_total([]), 0)
+self.assertEqual(total([]), 0)
 
 deftest_two_different_books(self):
-self.assertEqual(calculate_total([1, 2]), 1520)
+self.assertEqual(total([1, 2]), 1520)
 
 deftest_three_different_books(self):
-self.assertEqual(calculate_total([1, 2, 3]), 2160)
+self.assertEqual(total([1, 2, 3]), 2160)
 
 deftest_four_different_books(self):
-self.assertEqual(calculate_total([1, 2, 3, 4]), 2560)
+self.assertEqual(total([1, 2, 3, 4]), 2560)
 
 deftest_five_different_books(self):
-self.assertEqual(calculate_total([1, 2, 3, 4, 5]), 3000)
+self.assertEqual(total([1, 2, 3, 4, 5]), 3000)
 
 deftest_two_groups_of_4_is_cheaper_than_group_of_5_plus_group_of_3(self):
-self.assertEqual(calculate_total([1, 1, 2, 2, 3, 3, 4, 5]), 5120)
+self.assertEqual(total([1, 1, 2, 2, 3, 3, 4, 5]), 5120)
 
 deftest_two_groups_of_4_is_cheaper_than_groups_of_5_and_3(self):
-self.assertEqual(calculate_total([1, 1, 2, 3, 4, 4, 5, 5]), 5120)
+self.assertEqual(total([1, 1, 2, 3, 4, 4, 5, 5]), 5120)
 
 deftest_group_of_4_plus_group_of_2_is_cheaper_than_2_groups_of_3(self):
-self.assertEqual(calculate_total([1, 1, 2, 2, 3, 4]), 4080)
+self.assertEqual(total([1, 1, 2, 2, 3, 4]), 4080)
 
 deftest_two_each_of_first_4_books_and_1_copy_each_of_rest(self):
-self.assertEqual(calculate_total([1, 1, 2, 2, 3, 3, 4, 4, 5]), 5560)
+self.assertEqual(total([1, 1, 2, 2, 3, 3, 4, 4, 5]), 5560)
 
 deftest_two_copies_of_each_book(self):
-self.assertEqual(calculate_total([1, 1, 2, 2, 3, 3, 4, 4, 5, 5]), 6000)
+self.assertEqual(total([1, 1, 2, 2, 3, 3, 4, 4, 5, 5]), 6000)
 
 deftest_three_copies_of_first_book_and_2_each_of_remaining(self):
 self.assertEqual(
-calculate_total([1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1]), 6800)
+total([1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1]), 6800)
 
 deftest_three_each_of_first_2_books_and_2_each_of_remaining_books(self):
 self.assertEqual(
-calculate_total([1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1, 2]), 7520)
+total([1, 1, 2, 2, 3, 3, 4, 4, 5, 5, 1, 2]), 7520)
 
 deftest_four_groups_of_4_are_cheaper_than_2_groups_each_of_5_and_3(self):
 self.assertEqual(
-calculate_total([1, 1, 2, 2, 3, 3, 4, 5, 1, 1, 2, 2, 3, 3, 4, 5]),
+total([1, 1, 2, 2, 3, 3, 4, 5, 1, 1, 2, 2, 3, 3, 4, 5]),
 10240)
 
 

exercises/book-store/example.py

@@ -4,46 +4,48 @@
 discount= [1.0, 1.0, 0.95, 0.9, 0.8, 0.75]
 
 
-defgroupCost(g):
-returnlen(g) *discount[len(g)]
+defgroup_cost(group):
+returnlen(group) *discount[len(group)]
 
 
 classGrouping:
 def__init__(self, groups=None):
 self.groups= [set()] ifgroupsisNoneelsegroups
 
 deftotal(self):
-returnsum(map(groupCost, self.groups)) *BASE_COST
+returnsum(map(group_cost, self.groups)) *BASE_COST
 
 defdup(self):
 returnGrouping(list(map(set, self.groups)))
 
-defadd_to_valid(self, b):
-"""Returns all possible groupings from current grouping adding book b
+defadd_to_valid(self, book):
+"""Returns all possible groupings from the
+ current grouping adding book
  """
 other=self.dup()
 other.groups.sort(key=lambdag: len(g))
 results= []
-fori, ginenumerate(other.groups):
-ifbnoting:
-o2=other.dup()
-o2.groups[i].add(b)
-results.append(o2)
+forindex, groupinenumerate(other.groups):
+ifbooknotingroup:
+other2=other.dup()
+other2.groups[index].add(book)
+results.append(other2)
 ifnotresults:
-other.groups.append(set([b]))
+other.groups.append(set([book]))
 return [other]
 returnresults
 
 def__lt__(self, other):
 returnself.total() <other.total()
 
 
-defstep(rs, b):
-return [gforrinrsforginr.add_to_valid(b)]
+defstep(basket, book):
+return [groupforgroupingsinbasket
+forgroupingroupings.add_to_valid(book)]
 
 
-defcalculate_total(books):
-iflen(books) ==0:
+deftotal(basket):
+iflen(basket) ==0:
 return0
-start=Grouping([{books[0]}])
-returnround(min(reduce(step, books[1:], [start])).total())
+start=Grouping([{basket[0]}])
+returnround(min(reduce(step, basket[1:], [start])).total())