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/Warmup-1/.idea/Warmup-1.iml b/students/session01/Warmup-1/.idea/Warmup-1.iml new file mode 100644 index 0000000..fe78360 --- /dev/null +++ b/students/session01/Warmup-1/.idea/Warmup-1.iml @@ -0,0 +1,13 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/students/session01/Warmup-1/.idea/encodings.xml b/students/session01/Warmup-1/.idea/encodings.xml new file mode 100644 index 0000000..15a15b2 --- /dev/null +++ b/students/session01/Warmup-1/.idea/encodings.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/students/session01/Warmup-1/.idea/libraries/R_User_Library.xml b/students/session01/Warmup-1/.idea/libraries/R_User_Library.xml new file mode 100644 index 0000000..71f5ff7 --- /dev/null +++ b/students/session01/Warmup-1/.idea/libraries/R_User_Library.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/students/session01/Warmup-1/.idea/misc.xml b/students/session01/Warmup-1/.idea/misc.xml new file mode 100644 index 0000000..a2e120d --- /dev/null +++ b/students/session01/Warmup-1/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/students/session01/Warmup-1/.idea/modules.xml b/students/session01/Warmup-1/.idea/modules.xml new file mode 100644 index 0000000..6a52fdf --- /dev/null +++ b/students/session01/Warmup-1/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/students/session01/Warmup-1/.idea/workspace.xml b/students/session01/Warmup-1/.idea/workspace.xml new file mode 100644 index 0000000..c4211a5 --- /dev/null +++ b/students/session01/Warmup-1/.idea/workspace.xml @@ -0,0 +1,350 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1547869233555 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + file://$PROJECT_DIR$/Warmup-2/string_times.py + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file 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 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..eb8f665 --- /dev/null +++ b/students/session02/print_grid.py @@ -0,0 +1,29 @@ +# Part 2: + +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 (print_grid(3)) +print (print_grid(9)) + + + +# Part 3: + +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 diff --git a/students/session02/series.py b/students/session02/series.py new file mode 100644 index 0000000..0212d50 --- /dev/null +++ b/students/session02/series.py @@ -0,0 +1,63 @@ +## Fibonacci ## + +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)) + + + +## 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 (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 + + +## Tests + +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