From 29042897dd32530f8e19dee2feebfc7aebed6aa9 Mon Sep 17 00:00:00 2001 From: Lola Guerrero Date: Mon, 21 Jan 2019 18:42:16 -0800 Subject: [PATCH 01/11] Started branch --- lolaguerrero-A01/Test.txt | 1 + 1 file changed, 1 insertion(+) create mode 100644 lolaguerrero-A01/Test.txt diff --git a/lolaguerrero-A01/Test.txt b/lolaguerrero-A01/Test.txt new file mode 100644 index 0000000..00b49e6 --- /dev/null +++ b/lolaguerrero-A01/Test.txt @@ -0,0 +1 @@ +This is the folder I will use for assignment 01 From 071cc6aca0776b53c06b08d8ef32765c8a037d6b Mon Sep 17 00:00:00 2001 From: Lola Guerrero Date: Mon, 21 Jan 2019 18:51:17 -0800 Subject: [PATCH 02/11] adding session01 --- students/aaron/README.md | 9 - students/aaron/homework_lesson1/break_me.py | 18 - .../lesson1_task2_exercise1.py | 9 - .../lesson1_task2_exercise2.py | 9 - .../lesson1_task2_exercise3.py | 10 - students/lolaguerrero-A01/Test.txt | 1 + students/session01/.idea/encodings.xml | 4 + .../.idea/libraries/R_User_Library.xml | 6 + students/session01/.idea/misc.xml | 4 + students/session01/.idea/modules.xml | 8 + students/session01/.idea/session01.iml | 13 + students/session01/.idea/workspace.xml | 144 +++++++ .../session01/Warmup-1/.idea/Warmup-1.iml | 13 + .../session01/Warmup-1/.idea/encodings.xml | 4 + .../.idea/libraries/R_User_Library.xml | 6 + students/session01/Warmup-1/.idea/misc.xml | 4 + students/session01/Warmup-1/.idea/modules.xml | 8 + .../session01/Warmup-1/.idea/workspace.xml | 350 ++++++++++++++++++ students/session01/Warmup-1/diff21.py | 5 + students/session01/Warmup-1/front3.py | 5 + students/session01/Warmup-1/front_back.py | 7 + students/session01/Warmup-1/makes10.py | 4 + students/session01/Warmup-1/missing_char.py | 5 + students/session01/Warmup-1/monkey_trouble.py | 5 + students/session01/Warmup-1/near_hundred.py | 2 + students/session01/Warmup-1/not_string.py | 5 + students/session01/Warmup-1/parrot_trouble.py | 4 + students/session01/Warmup-1/pos_neg.py | 17 + students/session01/Warmup-1/pos_neg_doubt.py | 17 + students/session01/Warmup-1/sleep-in.py | 5 + students/session01/Warmup-1/sum_double.py | 5 + students/session01/break_me.py | 60 +++ 32 files changed, 711 insertions(+), 55 deletions(-) delete mode 100644 students/aaron/README.md delete mode 100644 students/aaron/homework_lesson1/break_me.py delete mode 100644 students/aaron/homework_lesson1/lesson1_task2_exercise1.py delete mode 100644 students/aaron/homework_lesson1/lesson1_task2_exercise2.py delete mode 100644 students/aaron/homework_lesson1/lesson1_task2_exercise3.py create mode 100644 students/lolaguerrero-A01/Test.txt create mode 100644 students/session01/.idea/encodings.xml create mode 100644 students/session01/.idea/libraries/R_User_Library.xml create mode 100644 students/session01/.idea/misc.xml create mode 100644 students/session01/.idea/modules.xml create mode 100644 students/session01/.idea/session01.iml create mode 100644 students/session01/.idea/workspace.xml create mode 100644 students/session01/Warmup-1/.idea/Warmup-1.iml create mode 100644 students/session01/Warmup-1/.idea/encodings.xml create mode 100644 students/session01/Warmup-1/.idea/libraries/R_User_Library.xml create mode 100644 students/session01/Warmup-1/.idea/misc.xml create mode 100644 students/session01/Warmup-1/.idea/modules.xml create mode 100644 students/session01/Warmup-1/.idea/workspace.xml create mode 100644 students/session01/Warmup-1/diff21.py create mode 100644 students/session01/Warmup-1/front3.py create mode 100644 students/session01/Warmup-1/front_back.py create mode 100644 students/session01/Warmup-1/makes10.py create mode 100644 students/session01/Warmup-1/missing_char.py create mode 100644 students/session01/Warmup-1/monkey_trouble.py create mode 100644 students/session01/Warmup-1/near_hundred.py create mode 100644 students/session01/Warmup-1/not_string.py create mode 100644 students/session01/Warmup-1/parrot_trouble.py create mode 100644 students/session01/Warmup-1/pos_neg.py create mode 100644 students/session01/Warmup-1/pos_neg_doubt.py create mode 100644 students/session01/Warmup-1/sleep-in.py create mode 100644 students/session01/Warmup-1/sum_double.py create mode 100644 students/session01/break_me.py diff --git a/students/aaron/README.md b/students/aaron/README.md deleted file mode 100644 index 0337c5e..0000000 --- a/students/aaron/README.md +++ /dev/null @@ -1,9 +0,0 @@ -# Readme for Student Aaron - -This is a readme file. - -I wrote it in an editor. - -It's not as long as a mile. - -Shorter is bett...itdor? diff --git a/students/aaron/homework_lesson1/break_me.py b/students/aaron/homework_lesson1/break_me.py deleted file mode 100644 index d126124..0000000 --- a/students/aaron/homework_lesson1/break_me.py +++ /dev/null @@ -1,18 +0,0 @@ -#--------------------------------- -# Title: Explore Errors (Task 1) -# Change Log: -# Aaron Devey,2018-01-12,Created -#--------------------------------- - - -def NameError(): - raise NameError - -def TypeError(): - raise TypeError - -def SyntaxError(): - raise SyntaxError - -def AttributeError(): - raise AttributeError diff --git a/students/aaron/homework_lesson1/lesson1_task2_exercise1.py b/students/aaron/homework_lesson1/lesson1_task2_exercise1.py deleted file mode 100644 index d2edcba..0000000 --- a/students/aaron/homework_lesson1/lesson1_task2_exercise1.py +++ /dev/null @@ -1,9 +0,0 @@ -#----------------------- -# Title: Lesson 1, Task 2, Exercise 1 (Codingbat Warmup-1: sleep_in) -# Changelog -# Aaron Devey,2018-09-12,New file -#----------------------- - -def sleep_in(weekday, vacation): - return ( not weekday ) or vacation - diff --git a/students/aaron/homework_lesson1/lesson1_task2_exercise2.py b/students/aaron/homework_lesson1/lesson1_task2_exercise2.py deleted file mode 100644 index 00c8d9e..0000000 --- a/students/aaron/homework_lesson1/lesson1_task2_exercise2.py +++ /dev/null @@ -1,9 +0,0 @@ -#-------------------- -# Title: Lesson 1, Task 2, Exercise 2 (Codingbat Warmup-1: monkey_trouble) -# Changelog: -# Aaron Devey,2019-01-12,New File -#--------------------- - -def monkey_trouble(a_smile, b_smile): - # using xor since it fits well here - return not (a_smile ^ b_smile) diff --git a/students/aaron/homework_lesson1/lesson1_task2_exercise3.py b/students/aaron/homework_lesson1/lesson1_task2_exercise3.py deleted file mode 100644 index 82f52cc..0000000 --- a/students/aaron/homework_lesson1/lesson1_task2_exercise3.py +++ /dev/null @@ -1,10 +0,0 @@ -#---------------------- -# Title: Lesson 1, Task2, Exercise 3 (Codingbat Warmup-1: sum_double) -# Changelog: -# Aaron Devey,2019-01-12,new file -#---------------------- - -def sum_double(a, b): - if a == b: - return (a+b) * 2 - return (a+b) diff --git a/students/lolaguerrero-A01/Test.txt b/students/lolaguerrero-A01/Test.txt new file mode 100644 index 0000000..00b49e6 --- /dev/null +++ b/students/lolaguerrero-A01/Test.txt @@ -0,0 +1 @@ +This is the folder I will use for assignment 01 diff --git a/students/session01/.idea/encodings.xml b/students/session01/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/students/session01/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/students/session01/.idea/libraries/R_User_Library.xml b/students/session01/.idea/libraries/R_User_Library.xml new file mode 100644 index 0000000..71f5ff7 --- /dev/null +++ b/students/session01/.idea/libraries/R_User_Library.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/students/session01/.idea/misc.xml b/students/session01/.idea/misc.xml new file mode 100644 index 0000000..a2e120d --- /dev/null +++ b/students/session01/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/students/session01/.idea/modules.xml b/students/session01/.idea/modules.xml new file mode 100644 index 0000000..9baab5e --- /dev/null +++ b/students/session01/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/students/session01/.idea/session01.iml b/students/session01/.idea/session01.iml new file mode 100644 index 0000000..fe78360 --- /dev/null +++ b/students/session01/.idea/session01.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/students/session01/.idea/workspace.xml b/students/session01/.idea/workspace.xml new file mode 100644 index 0000000..0da9cd1 --- /dev/null +++ b/students/session01/.idea/workspace.xml @@ -0,0 +1,144 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1547908525585 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/students/session01/Warmup-1/diff21.py b/students/session01/Warmup-1/diff21.py new file mode 100644 index 0000000..ef0db44 --- /dev/null +++ b/students/session01/Warmup-1/diff21.py @@ -0,0 +1,5 @@ +def diff21(n): + abs_diff = abs(21 - n) + if n > 21: + abs_diff = 2 * abs_diff + return abs_diff \ No newline at end of file diff --git a/students/session01/Warmup-1/front3.py b/students/session01/Warmup-1/front3.py new file mode 100644 index 0000000..7d4cc3f --- /dev/null +++ b/students/session01/Warmup-1/front3.py @@ -0,0 +1,5 @@ +def front3(str): + if len(str) < 3: + return str*3 + else: + return str[:3]*3 \ No newline at end of file diff --git a/students/session01/Warmup-1/front_back.py b/students/session01/Warmup-1/front_back.py new file mode 100644 index 0000000..de08ab1 --- /dev/null +++ b/students/session01/Warmup-1/front_back.py @@ -0,0 +1,7 @@ +def front_back(str): + if len(str) > 1: + first_char = str[0] + last_char = str[-1] + return last_char + str[1:-1] + first_char + else: + return str \ No newline at end of file diff --git a/students/session01/Warmup-1/makes10.py b/students/session01/Warmup-1/makes10.py new file mode 100644 index 0000000..40fe0ec --- /dev/null +++ b/students/session01/Warmup-1/makes10.py @@ -0,0 +1,4 @@ +def makes10(a, b): + if a == 10 or b == 10 or a + b == 10: + return True + return False \ No newline at end of file diff --git a/students/session01/Warmup-1/missing_char.py b/students/session01/Warmup-1/missing_char.py new file mode 100644 index 0000000..5128478 --- /dev/null +++ b/students/session01/Warmup-1/missing_char.py @@ -0,0 +1,5 @@ +def missing_char(str, n): + if n < 0: + return 'Choose a index >= 0' + else: + return str[:n] + str[n+1:] \ No newline at end of file diff --git a/students/session01/Warmup-1/monkey_trouble.py b/students/session01/Warmup-1/monkey_trouble.py new file mode 100644 index 0000000..71b0f36 --- /dev/null +++ b/students/session01/Warmup-1/monkey_trouble.py @@ -0,0 +1,5 @@ +def monkey_trouble(a_smile, b_smile): + if a_smile == b_smile: + return True + else: + return False \ No newline at end of file diff --git a/students/session01/Warmup-1/near_hundred.py b/students/session01/Warmup-1/near_hundred.py new file mode 100644 index 0000000..51c1165 --- /dev/null +++ b/students/session01/Warmup-1/near_hundred.py @@ -0,0 +1,2 @@ +def near_hundred(n): + return abs(100 - n) <= 10 or abs(200 - n) <= 10 \ No newline at end of file diff --git a/students/session01/Warmup-1/not_string.py b/students/session01/Warmup-1/not_string.py new file mode 100644 index 0000000..8a46e10 --- /dev/null +++ b/students/session01/Warmup-1/not_string.py @@ -0,0 +1,5 @@ +def not_string(str): + if str.startswith('not'): + return str + else: + return 'not ' + str \ No newline at end of file diff --git a/students/session01/Warmup-1/parrot_trouble.py b/students/session01/Warmup-1/parrot_trouble.py new file mode 100644 index 0000000..2f38b7f --- /dev/null +++ b/students/session01/Warmup-1/parrot_trouble.py @@ -0,0 +1,4 @@ +def parrot_trouble(talking, hour): + if talking and (hour < 7 or hour > 20): + return True + return False \ No newline at end of file diff --git a/students/session01/Warmup-1/pos_neg.py b/students/session01/Warmup-1/pos_neg.py new file mode 100644 index 0000000..4e42269 --- /dev/null +++ b/students/session01/Warmup-1/pos_neg.py @@ -0,0 +1,17 @@ +def pos_neg(a, b, negative): + if negative: + if (a < 0) and (b > 0): + return False + elif (a > 0) and (b < 0): + return False + elif (a < 0 and b < 0): + return True + else: + return False + else: + if (a < 0) and (b > 0): + return True + elif (a > 0) and (b < 0): + return True + else: + return False \ No newline at end of file diff --git a/students/session01/Warmup-1/pos_neg_doubt.py b/students/session01/Warmup-1/pos_neg_doubt.py new file mode 100644 index 0000000..22477d6 --- /dev/null +++ b/students/session01/Warmup-1/pos_neg_doubt.py @@ -0,0 +1,17 @@ +def pos_neg(a, b, negative): + if negative: + if (a < 0 and b > 0): + return True + else: + if ((a < 0 and b > 0) or (a > 0 and b < 0)): + return True + + + +#Porpoused solution: + +def pos_neg(a, b, negative): + if negative: + return (a < 0 and b < 0) + else: + return ((a < 0 and b > 0) or (a > 0 and b < 0)) \ No newline at end of file diff --git a/students/session01/Warmup-1/sleep-in.py b/students/session01/Warmup-1/sleep-in.py new file mode 100644 index 0000000..7fbbc81 --- /dev/null +++ b/students/session01/Warmup-1/sleep-in.py @@ -0,0 +1,5 @@ +def sleep_in(weekday, vacation): + if not weekday or vacation: + return True + else: + return False \ No newline at end of file diff --git a/students/session01/Warmup-1/sum_double.py b/students/session01/Warmup-1/sum_double.py new file mode 100644 index 0000000..f988923 --- /dev/null +++ b/students/session01/Warmup-1/sum_double.py @@ -0,0 +1,5 @@ +def sum_double(a, b): + sum = a + b + if a == b: + sum = 2 * sum + return sum \ No newline at end of file diff --git a/students/session01/break_me.py b/students/session01/break_me.py new file mode 100644 index 0000000..7516855 --- /dev/null +++ b/students/session01/break_me.py @@ -0,0 +1,60 @@ +#-------------------------------------# + +# Title: Task 1 - Explore Errors + +# Lola Guerrero - Python210 Winter + +# RRoot, 18/01/2019, Created File + +#-------------------------------------# + + +# Each function, when called, should cause an exception to happen +# Each function should result in one of the four most common exceptions you’ll find. +# for review: NameError, TypeError, SyntaxError, AttributeError + + + +def Excep_NameError(): + try: + print (a) + except NameError: + print ('The variable a is not defined') + +print (Excep_NameError()) + + + + +def Excep_TypeError(x): + try: + print (32/x) + except TypeError: + print (x + ' has inappropriate type') + +print (Excep_TypeError('4')) +print(Excep_TypeError(4)) + + +def Excep_SyntaxError(): + try: + print (3 /% 4) + except SyntaxError: + print('Review your expression') + + +print (Excep_SyntaxError()) #How do you make an exception in a SyntaxError?? + + + +def Excep_AttributeError(): + try: + import string + print (string.digit) + except AttributeError: + print('Attribute error') + + +print (Excep_AttributeError()) + + From 98d2a9e80faa0a3b1e44b5505b618d595b6b1662 Mon Sep 17 00:00:00 2001 From: Lola Guerrero Date: Mon, 21 Jan 2019 18:52:51 -0800 Subject: [PATCH 03/11] moving A01 --- lolaguerrero-A01/Test.txt | 1 - 1 file changed, 1 deletion(-) delete mode 100644 lolaguerrero-A01/Test.txt diff --git a/lolaguerrero-A01/Test.txt b/lolaguerrero-A01/Test.txt deleted file mode 100644 index 00b49e6..0000000 --- a/lolaguerrero-A01/Test.txt +++ /dev/null @@ -1 +0,0 @@ -This is the folder I will use for assignment 01 From 42d2654d47e4d3df14f7c2167c7815761e06d97c Mon Sep 17 00:00:00 2001 From: Lola Guerrero Date: Mon, 21 Jan 2019 18:55:10 -0800 Subject: [PATCH 04/11] deleting wrong folder --- students/session01/.idea/encodings.xml | 4 - .../.idea/libraries/R_User_Library.xml | 6 - students/session01/.idea/misc.xml | 4 - students/session01/.idea/modules.xml | 8 - students/session01/.idea/session01.iml | 13 -- students/session01/.idea/workspace.xml | 144 ------------------ 6 files changed, 179 deletions(-) delete mode 100644 students/session01/.idea/encodings.xml delete mode 100644 students/session01/.idea/libraries/R_User_Library.xml delete mode 100644 students/session01/.idea/misc.xml delete mode 100644 students/session01/.idea/modules.xml delete mode 100644 students/session01/.idea/session01.iml delete mode 100644 students/session01/.idea/workspace.xml diff --git a/students/session01/.idea/encodings.xml b/students/session01/.idea/encodings.xml deleted file mode 100644 index 15a15b2..0000000 --- a/students/session01/.idea/encodings.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/students/session01/.idea/libraries/R_User_Library.xml b/students/session01/.idea/libraries/R_User_Library.xml deleted file mode 100644 index 71f5ff7..0000000 --- a/students/session01/.idea/libraries/R_User_Library.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/students/session01/.idea/misc.xml b/students/session01/.idea/misc.xml deleted file mode 100644 index a2e120d..0000000 --- a/students/session01/.idea/misc.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - - \ No newline at end of file diff --git a/students/session01/.idea/modules.xml b/students/session01/.idea/modules.xml deleted file mode 100644 index 9baab5e..0000000 --- a/students/session01/.idea/modules.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/students/session01/.idea/session01.iml b/students/session01/.idea/session01.iml deleted file mode 100644 index fe78360..0000000 --- a/students/session01/.idea/session01.iml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/students/session01/.idea/workspace.xml b/students/session01/.idea/workspace.xml deleted file mode 100644 index 0da9cd1..0000000 --- a/students/session01/.idea/workspace.xml +++ /dev/null @@ -1,144 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1547869233555 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + file://$PROJECT_DIR$/Warmup-2/string_times.py + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/students/session02/Warmup-2/array123.py b/students/session02/Warmup-2/array123.py new file mode 100644 index 0000000..5f8aed0 --- /dev/null +++ b/students/session02/Warmup-2/array123.py @@ -0,0 +1,7 @@ +def string_match(a, b): + min_len = min(len(a), len(b)) + count = 0 + for i in range(min_len): + if (len(a[i:i+2]) == 2) and (a[i:i+2] == b[i:i+2]): + count +=1 + return count \ No newline at end of file diff --git a/students/session02/Warmup-2/array_count9.py b/students/session02/Warmup-2/array_count9.py new file mode 100644 index 0000000..8bef7e8 --- /dev/null +++ b/students/session02/Warmup-2/array_count9.py @@ -0,0 +1,6 @@ +def array_count9(nums): + count = 0 + for i in nums: + if i == 9: + count += 1 + return count \ No newline at end of file diff --git a/students/session02/Warmup-2/array_front9.py b/students/session02/Warmup-2/array_front9.py new file mode 100644 index 0000000..fc46793 --- /dev/null +++ b/students/session02/Warmup-2/array_front9.py @@ -0,0 +1,2 @@ +def array_front9(nums): + return (9 in nums[:4]) \ No newline at end of file diff --git a/students/session02/Warmup-2/front_times.py b/students/session02/Warmup-2/front_times.py new file mode 100644 index 0000000..eaa2fb3 --- /dev/null +++ b/students/session02/Warmup-2/front_times.py @@ -0,0 +1,19 @@ +def front_times(str, n): + if n < 0: + return 'Try with a positive number' + else: + return str[:3]*n + + +# Purposed solution: + +def front_times(str, n): + front_len = 3 + if front_len > len(str): #Why is this important? I mean if the len of the string is 2, string[:6] == string + front_len = len(str) + front = str[:front_len] + + result = "" + for i in range(n): + result = result + front + return result \ No newline at end of file diff --git a/students/session02/Warmup-2/last2.py b/students/session02/Warmup-2/last2.py new file mode 100644 index 0000000..b6f427a --- /dev/null +++ b/students/session02/Warmup-2/last2.py @@ -0,0 +1,12 @@ +def last2(str): + if len(str) < 3: + count = 0 + else: + sub_str = str[-2:] + count = 0 + for i in range(len(str)-2): + print ('sub_str', sub_str) + print(str[i:i+2]) + if sub_str == str[i:i+2]: + count +=1 + return count \ No newline at end of file diff --git a/students/session02/Warmup-2/string_bits.py b/students/session02/Warmup-2/string_bits.py new file mode 100644 index 0000000..6b8a70f --- /dev/null +++ b/students/session02/Warmup-2/string_bits.py @@ -0,0 +1,2 @@ +def string_bits(str): + return str[::2] \ No newline at end of file diff --git a/students/session02/Warmup-2/string_match.py b/students/session02/Warmup-2/string_match.py new file mode 100644 index 0000000..34ec196 --- /dev/null +++ b/students/session02/Warmup-2/string_match.py @@ -0,0 +1,5 @@ +def array123(nums): + for i in range(len(nums)-2): + if nums[i] == 1 and nums[i+1] == 2 and nums[i+2] == 3: + return True + return False \ No newline at end of file diff --git a/students/session02/Warmup-2/string_splosion.py b/students/session02/Warmup-2/string_splosion.py new file mode 100644 index 0000000..2597fe0 --- /dev/null +++ b/students/session02/Warmup-2/string_splosion.py @@ -0,0 +1,5 @@ +def string_splosion(str): + new_str = '' + for i in range(len(str)+1): + new_str +=str[:i] + return new_str \ No newline at end of file diff --git a/students/session02/Warmup-2/string_times.py b/students/session02/Warmup-2/string_times.py new file mode 100644 index 0000000..db24be6 --- /dev/null +++ b/students/session02/Warmup-2/string_times.py @@ -0,0 +1,14 @@ +def string_times(str, n): + if n < 0: + return 'Try with a positive number' + else: + return str*n + + +# Purposed solution + +def string_times(str, n): + result = "" + for i in range(n): # range(n) is [0, 1, 2, .... n-1] + result = result + str # could use += here + return result \ No newline at end of file diff --git a/students/session02/print_grid.py b/students/session02/print_grid.py new file mode 100644 index 0000000..f58dbd6 --- /dev/null +++ b/students/session02/print_grid.py @@ -0,0 +1,14 @@ + +print(('+' + '-' *4)*3, end='+\n') +print ((('|' + ' '*4)*4 +'\n')*4) +print(('+' + '-' *4)*3, end='+\n') + +print ((('|' + ' '*4)*3 +'\n')*4) + + +print(('|' + ' ' *4)*3, end='|') + + +print (('|' + ' ' *4)*3, end='|\n')*3) + +print ((('|' + ' '*4)*3 +'\n') \ No newline at end of file From 7b5f7e7a45096abcf71f7359fad1941174fbe32d Mon Sep 17 00:00:00 2001 From: Lola Guerrero Date: Mon, 21 Jan 2019 19:13:57 -0800 Subject: [PATCH 06/11] adding FizzBuzz --- students/session02/FizzBuzz.py | 12 ++++++++++++ 1 file changed, 12 insertions(+) create mode 100644 students/session02/FizzBuzz.py diff --git a/students/session02/FizzBuzz.py b/students/session02/FizzBuzz.py new file mode 100644 index 0000000..f75b36f --- /dev/null +++ b/students/session02/FizzBuzz.py @@ -0,0 +1,12 @@ +def FizzBuzz(): + for i in range(1, 101): + if (i % 3 == 0) and (i % 5 == 0): + print('FizzBuzz') + elif i % 3 == 0: + print ('Fizz') + elif i % 5 == 0: + print('Buzz') + else: + print (i) + +print (FizzBuzz()) \ No newline at end of file From b29fa49d29fae6493d01628ec9db65e9690911f8 Mon Sep 17 00:00:00 2001 From: Lola Guerrero Date: Mon, 21 Jan 2019 19:30:23 -0800 Subject: [PATCH 07/11] adding fibonacci --- students/session02/series.py | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100644 students/session02/series.py diff --git a/students/session02/series.py b/students/session02/series.py new file mode 100644 index 0000000..cdca303 --- /dev/null +++ b/students/session02/series.py @@ -0,0 +1,13 @@ +def fibonacci(n): + if n == 0: + return 0 + elif n == 1: + return 1 + else: + ans = fibonacci(n-2) + fibonacci(n-1) + return ans + + + +for i in range(0,10): + print (fibonacci(i)) \ No newline at end of file From e99c60d37e733f597a65d0ca7c8ff01c2958e32d Mon Sep 17 00:00:00 2001 From: Lola Guerrero Date: Mon, 21 Jan 2019 19:33:53 -0800 Subject: [PATCH 08/11] adding lucas --- students/session02/series.py | 20 +++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/students/session02/series.py b/students/session02/series.py index cdca303..55e3a1c 100644 --- a/students/session02/series.py +++ b/students/session02/series.py @@ -1,3 +1,5 @@ +## Fibonacci ## + def fibonacci(n): if n == 0: return 0 @@ -8,6 +10,22 @@ def fibonacci(n): return ans +for i in range(0,10): + print (fibonacci(i)) + + + +## Lucas ## + +def lucas(n): + if n == 0: + return 2 + elif n == 1: + return 1 + else: + ans = lucas(n-2) + lucas(n-1) + return ans + for i in range(0,10): - print (fibonacci(i)) \ No newline at end of file + print (lucas(i)) \ No newline at end of file From 5a89449de1b39e2939ac500809379af744032109 Mon Sep 17 00:00:00 2001 From: Lola Guerrero Date: Mon, 21 Jan 2019 21:26:00 -0800 Subject: [PATCH 09/11] adding grid --- students/session02/print_grid.py | 29 ++++++++++++++++++++++------- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/students/session02/print_grid.py b/students/session02/print_grid.py index f58dbd6..eb8f665 100644 --- a/students/session02/print_grid.py +++ b/students/session02/print_grid.py @@ -1,14 +1,29 @@ +# Part 2: -print(('+' + '-' *4)*3, end='+\n') -print ((('|' + ' '*4)*4 +'\n')*4) -print(('+' + '-' *4)*3, end='+\n') +def print_grid(n): + m = int(n / 2) + for i in range (0, 2): + print ('+' + ('-' * m) + '+' + ('-' * m) + '+') + for i in range(0, m): + print ('|' + (' ' * m) + '|' + (' ' * m) + '|') + print ('+' + ('-' * m) + '+' + ('-' * m) + '+') -print ((('|' + ' '*4)*3 +'\n')*4) +print (print_grid(3)) +print (print_grid(9)) -print(('|' + ' ' *4)*3, end='|') -print (('|' + ' ' *4)*3, end='|\n')*3) +# Part 3: -print ((('|' + ' '*4)*3 +'\n') \ No newline at end of file +def print_grid2(number, size): + + for i in range (0, number): + print (('+' + ('-' * size)) * number + '+') + for i in range(0, size): + print (('|' + (' ' * size)) * number + '|') + print(('+' + ('-' * size)) * number + '+') + + +print_grid2(5,3) ## 5 number of squares, 3 size squares +print_grid2(3,5) ## 3 number of squares, 5 size squares \ No newline at end of file From 269d9a6c5d8a072e6f627c363a47ca062de3bb5d Mon Sep 17 00:00:00 2001 From: Lola Guerrero Date: Mon, 21 Jan 2019 22:13:28 -0800 Subject: [PATCH 10/11] adding generalizing --- students/session02/series.py | 41 +++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/students/session02/series.py b/students/session02/series.py index 55e3a1c..e2c756f 100644 --- a/students/session02/series.py +++ b/students/session02/series.py @@ -28,4 +28,43 @@ def lucas(n): for i in range(0,10): - print (lucas(i)) \ No newline at end of file + print (lucas(i)) + + + +## Generalizing ## + +def sum_series(n, v1=0, v2=1): + + if (v1 == 2) and (v2 == 1): + if n == 0: + return 2 + elif n == 1: + return 1 + else: + ans = sum_series(n - 2, v1=2, v2=1) + sum_series(n - 1, v1=2, v2=1) + else: + if n == 0: + return 0 + elif n == 1: + return 1 + + else: + ans = sum_series(n - 2) + sum_series(n - 1) + + return ans + + +print (fibonacci(9)) +print (sum_series(9)) + +print (fibonacci(13)) +print (sum_series(13)) + + + +print (lucas(9)) +print (sum_series(9, v1=2, v2=1)) + +print (lucas(13)) +print (sum_series(13, v1=2, v2=1)) \ No newline at end of file From b9886169ae823b998a894caa690810448d788147 Mon Sep 17 00:00:00 2001 From: Lola Guerrero Date: Mon, 21 Jan 2019 22:19:51 -0800 Subject: [PATCH 11/11] adding Tests --- students/session02/series.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) diff --git a/students/session02/series.py b/students/session02/series.py index e2c756f..0212d50 100644 --- a/students/session02/series.py +++ b/students/session02/series.py @@ -55,16 +55,9 @@ def sum_series(n, v1=0, v2=1): return ans -print (fibonacci(9)) -print (sum_series(9)) +## Tests -print (fibonacci(13)) -print (sum_series(13)) - - - -print (lucas(9)) -print (sum_series(9, v1=2, v2=1)) - -print (lucas(13)) -print (sum_series(13, v1=2, v2=1)) \ No newline at end of file +assert (fibonacci(9) == sum_series(9)) +assert (fibonacci(13) == sum_series(13)) +assert (lucas(9) == sum_series(9, v1=2, v2=1)) +assert (lucas(13) == sum_series(13, v1=2, v2=1)) \ No newline at end of file