From a9afc8ddd579460099c6b65cce748e7ad6eca6a9 Mon Sep 17 00:00:00 2001 From: soheshdoshi Date: Thu, 29 Mar 2018 23:51:29 +0530 Subject: [PATCH 1/2] Implemented bestBathroom --- .idea/Spring_2018_WICC_OSC.iml | 11 + .idea/misc.xml | 4 + .idea/modules.xml | 8 + .idea/vcs.xml | 6 + .idea/workspace.xml | 425 +++++++++++++++++++++++++++++++++ src/bestBathroom.py | 2 +- testing/bestBathroom_test.py | 5 +- 7 files changed, 457 insertions(+), 4 deletions(-) create mode 100644 .idea/Spring_2018_WICC_OSC.iml create mode 100644 .idea/misc.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.idea/Spring_2018_WICC_OSC.iml b/.idea/Spring_2018_WICC_OSC.iml new file mode 100644 index 0000000..6711606 --- /dev/null +++ b/.idea/Spring_2018_WICC_OSC.iml @@ -0,0 +1,11 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..12f37ed --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,4 @@ + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..e1b888a --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..7523065 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,425 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1522347124572 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/bestBathroom.py b/src/bestBathroom.py index 13e6a71..07dfeb5 100644 --- a/src/bestBathroom.py +++ b/src/bestBathroom.py @@ -1,3 +1,3 @@ #Return 'Gates Hall' because gates has the best bathrooms def best_bathroom(): - pass + return 'Gates Hall' diff --git a/testing/bestBathroom_test.py b/testing/bestBathroom_test.py index 41c2e6c..58664d0 100644 --- a/testing/bestBathroom_test.py +++ b/testing/bestBathroom_test.py @@ -2,9 +2,8 @@ import os import sys cwd = os.getcwd() -sys.path.append(cwd + '/../src') - - +sys.path.append(cwd + '/../src/') +#/home/sohesh/Desktop/pyhton_github/Spring_2018_WICC_OSC/src/bestBathroom.py import bestBathroom class bestBathroomTest(unittest.TestCase): From d1e792db25cd97bc9707a0537c33d17fa0341ec8 Mon Sep 17 00:00:00 2001 From: soheshdoshi Date: Fri, 30 Mar 2018 00:04:29 +0530 Subject: [PATCH 2/2] calcSum --- .idea/workspace.xml | 79 +++++++++++++++++++++++++++++++++------------ src/calcSum.py | 5 ++- 2 files changed, 62 insertions(+), 22 deletions(-) diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 7523065..625236d 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,9 +2,8 @@ - - - + + @@ -124,7 +124,7 @@ - + + + - + + - - - - + + + + + @@ -381,7 +400,7 @@ - + @@ -403,6 +422,14 @@ + + + + + + + + @@ -413,10 +440,20 @@ - + - - + + + + + + + + + + + + diff --git a/src/calcSum.py b/src/calcSum.py index e998e7a..5bc071f 100644 --- a/src/calcSum.py +++ b/src/calcSum.py @@ -1,3 +1,6 @@ #Return the sum of the numbers in the list def calc_sum(nums): - pass + theSum = 0 + for i in nums: + theSum = theSum + i + return theSum