coding done

Author: papagrump

data/alice.txt

@@ -0,0 +1,17 @@
+Alice was beginning to get very tired of sitting by her sister on the bank, and of having nothing to do: once or twice she had peeped into the book her sister was reading, but it had no pictures or conversations in it, 'and what is the use of a book,' thought Alice 'without pictures or conversations?'
+So she was considering in her own mind (as well as she could, for the hot day made her feel very sleepy and stupid), whether the pleasure of making a daisy-chain would be worth the trouble of getting up and picking the daisies, when suddenly a White Rabbit with pink eyes ran close by her.
+There was nothing so VERY remarkable in that; nor did Alice think it so VERY much out of the way to hear the Rabbit say to itself, 'Oh dear! Oh dear! I shall be late!' (when she thought it over afterwards, it occurred to her that she ought to have wondered at this, but at the time it all seemed quite natural); but when the Rabbit actually TOOK A WATCH OUT OF ITS WAISTCOAT-POCKET, and looked at it, and then hurried on, Alice started to her feet, for it flashed across her mind that she had never before seen a rabbit with either a waistcoat-pocket, or a watch to take out of it, and burning with curiosity, she ran across the field after it, and fortunately was just in time to see it pop down a large rabbit-hole under the hedge.
+In another moment down went Alice after it, never once considering how in the world she was to get out again.
+The rabbit-hole went straight on like a tunnel for some way, and then dipped suddenly down, so suddenly that Alice had not a moment to think about stopping herself before she found herself falling down a very deep well.
+Either the well was very deep, or she fell very slowly, for she had plenty of time as she went down to look about her and to wonder what was going to happen next. First, she tried to look down and make out what she was coming to, but it was too dark to see anything; then she looked at the sides of the well, and noticed that they were filled with cupboards and book-shelves; here and there she saw maps and pictures hung upon pegs. She took down a jar from one of the shelves as she passed; it was labelled 'ORANGE MARMALADE', but to her great disappointment it was empty: she did not like to drop the jar for fear of killing somebody, so managed to put it into one of the cupboards as she fell past it.
+'Well!' thought Alice to herself, 'after such a fall as this, I shall think nothing of tumbling down stairs! How brave they'll all think me at home! Why, I wouldn't say anything about it, even if I fell off the top of the house!' (Which was very likely true.)
+Down, down, down. Would the fall NEVER come to an end! 'I wonder how many miles I've fallen by this time?' she said aloud. 'I must be getting somewhere near the centre of the earth. Let me see: that would be four thousand miles down, I think—' (for, you see, Alice had learnt several things of this sort in her lessons in the schoolroom, and though this was not a VERY good opportunity for showing off her knowledge, as there was no one to listen to her, still it was good practice to say it over) '—yes, that's about the right distance—but then I wonder what Latitude or Longitude I've got to?' (Alice had no idea what Latitude was, or Longitude either, but thought they were nice grand words to say.)
+Presently she began again. 'I wonder if I shall fall right THROUGH the earth! How funny it'll seem to come out among the people that walk with their heads downward! The Antipathies, I think—' (she was rather glad there WAS no one listening, this time, as it didn't sound at all the right word) '—but I shall have to ask them what the name of the country is, you know. Please, Ma'am, is this New Zealand or Australia?' (and she tried to curtsey as she spoke—fancy CURTSEYING as you're falling through the air! Do you think you could manage it?) 'And what an ignorant little girl she'll think me for asking! No, it'll never do to ask: perhaps I shall see it written up somewhere.'
+Down, down, down. There was nothing else to do, so Alice soon began talking again. 'Dinah'll miss me very much to-night, I should think!' (Dinah was the cat.) 'I hope they'll remember her saucer of milk at tea-time. Dinah my dear! I wish you were down here with me! There are no mice in the air, I'm afraid, but you might catch a bat, and that's very like a mouse, you know. But do cats eat bats, I wonder?' And here Alice began to get rather sleepy, and went on saying to herself, in a dreamy sort of way, 'Do cats eat bats? Do cats eat bats?' and sometimes, 'Do bats eat cats?' for, you see, as she couldn't answer either question, it didn't much matter which way she put it. She felt that she was dozing off, and had just begun to dream that she was walking hand in hand with Dinah, and saying to her very earnestly, 'Now, Dinah, tell me the truth: did you ever eat a bat?' when suddenly, thump! thump! down she came upon a heap of sticks and dry leaves, and the fall was over.
+Alice was not a bit hurt, and she jumped up on to her feet in a moment: she looked up, but it was all dark overhead; before her was another long passage, and the White Rabbit was still in sight, hurrying down it. There was not a moment to be lost: away went Alice like the wind, and was just in time to hear it say, as it turned a corner, 'Oh my ears and whiskers, how late it's getting!' She was close behind it when she turned the corner, but the Rabbit was no longer to be seen: she found herself in a long, low hall, which was lit up by a row of lamps hanging from the roof.
+There were doors all round the hall, but they were all locked; and when Alice had been all the way down one side and up the other, trying every door, she walked sadly down the middle, wondering how she was ever to get out again.
+Suddenly she came upon a little three-legged table, all made of solid glass; there was nothing on it except a tiny golden key, and Alice's first thought was that it might belong to one of the doors of the hall; but, alas! either the locks were too large, or the key was too small, but at any rate it would not open any of them. However, on the second time round, she came upon a low curtain she had not noticed before, and behind it was a little door about fifteen inches high: she tried the little golden key in the lock, and to her great delight it fitted!
+Alice opened the door and found that it led into a small passage, not much larger than a rat-hole: she knelt down and looked along the passage into the loveliest garden you ever saw. How she longed to get out of that dark hall, and wander about among those beds of bright flowers and those cool fountains, but she could not even get her head through the doorway; 'and even if my head would go through,' thought poor Alice, 'it would be of very little use without my shoulders. Oh, how I wish I could shut up like a telescope! I think I could, if I only knew how to begin.' For, you see, so many out-of-the-way things had happened lately, that Alice had begun to think that very few things indeed were really impossible.
+There seemed to be no use in waiting by the little door, so she went back to the table, half hoping she might find another key on it, or at any rate a book of rules for shutting people up like telescopes: this time she found a little bottle on it, ('which certainly was not here before,' said Alice,) and round the neck of the bottle was a paper label, with the words 'DRINK ME' beautifully printed on it in large letters.
+It was all very well to say 'Drink me,' but the wise little Alice was not going to do THAT in a hurry. 'No, I'll look first,' she said, 'and see whether it's marked "poison" or not'; for she had read several nice little histories about children who had got burnt, and eaten up by wild beasts and other unpleasant things, all because they WOULD not remember the simple rules their friends had taught them: such as, that a red-hot poker will burn you if you hold it too long; and that if you cut your finger VERY deeply with a knife, it usually bleeds; and she had never forgotten that, if you drink much from a bottle marked 'poison,' it is almost certain to disagree with you, sooner or later.
+However, this bottle was NOT marked 'poison,' so Alice ventured to taste it, and finding it very nice, (it had, in fact, a sort of mixed flavour of cherry-tart, custard, pine-apple, roast turkey, toffee, and hot buttered toast,) she very soon finished it off.

src/__pycache__/assessment.cpython-36.pyc

@@ -21,6 +21,7 @@ def count_characters(string):
         else:
             d[char] += 1
     return d
+   
 
 
 def invert_dictionary(d):
@@ -56,7 +57,17 @@ def word_count(filename):
       2. number of words (broken by whitespace)
       3. number of characters
     '''
-    pass
+    nlin = 0
+    nword = 0
+    nchar = 0
+    f = open(filename)
+    lines = f.readlines()
+    for line in lines:
+        nlin += 1
+        nword += len(line.split(' '))
+        nchar += len(line)
+
+    return (nlin,nword,nchar)
 
 
 def matrix_multiplication(A, B):
@@ -79,8 +90,17 @@ def matrix_multiplication(A, B):
 
     Please do not use numpy. Write your solution in straight python.
     '''
-    pass
-
+    '''
+    # iterate through rows of A
+    for i in range(len(A)):
+        # iterate through columns of B
+        for j in range(len(B[0])):
+            # iterate through rows of B
+            for k in range(len(B)):
+                result[i][j] += A[i][k] * B[k][j]
+    return result
+    '''
+    return [[sum(a*b for a,b in zip(A_row,B_col)) for B_col in zip(*B)] for A_row in A]
 
 # NumPy SECTION
 
@@ -101,7 +121,7 @@ def array_work(rows, cols, scalar, matrixA):
             [5, 6],   *   [5, 5, 5]]
             [7, 8]]
     '''
-    pass
+    return np.dot(matrixA, np.full((rows, cols), scalar))
 
 
 def boolean_indexing(arr, minimum):
@@ -117,7 +137,7 @@ def boolean_indexing(arr, minimum):
     In [1]: boolean_indexing([[3, 4, 5], [6, 7, 8]], 7)
     Out[1]: array([7, 8])
     '''
-    pass
+    return arr[arr >= minimum]
 
 
 # Pandas SECTION
@@ -140,7 +160,7 @@ def make_series(start, length, index):
     c    7
     dtype: int64
     '''
-    pass
+    return pd.Series(range(start,start + length), index)
 
 
 def data_frame_work(df, colA, colB, colC):
@@ -151,4 +171,5 @@ def data_frame_work(df, colA, colB, colC):
     Insert a column (colC) into the dataframe that is the sum of colA and colB.
     Assume that df contains columns colA and colB and that these are numeric.
     '''
-    pass
+    df[colC] = df[colA] + df[colB]
+    return df

src/assessment.py

@@ -1,6 +1,8 @@
 #
 # 
 import src.assessment as a
+import numpy as np
+import pandas as pd
 
 def test_count_characters():
     string = "abafdcggfaabe"
@@ -15,19 +17,19 @@ def test_invert_dictionary():
     assert (a.invert_dictionary(d) == result)
     print(a.invert_dictionary(d))
 
-'''
-def test_word_count(self):
-    self.assertEqual(a.word_count('data/alice.txt'), (17, 1615, 8449))
 
+def test_word_count():
+   # assert (a.word_count('data/alice.txt') == (17, 1615, 8449))
+    assert (a.word_count('data/alice.txt') == (17, 1615, 8461))
 
-def test_matrix_multiplication(self):
+
+def test_matrix_multiplication():
     A = [[2, 3, 4], [6, 4, 2], [-1, 2, 0]]
     B = [[8, -3, 1], [-7, 3, 2], [0, 3, 3]]
     answer = [[-5, 15, 20], [20, 0, 20], [-22, 9, 3]]
-    self.assertEqual(a.matrix_multiplication(A, B), answer)
-
+    assert(a.matrix_multiplication(A, B) == answer)
 
-def test_array_work(self):
+def test_array_work():
     matrixA = np.array([[-4, -2],
                         [0, -3],
                         [-4, -1],
@@ -39,45 +41,44 @@ def test_array_work(self):
                         [0, 0, 0],
                         [-12, -12, -12]])
     result1 = a.array_work(2, 3, 4, matrixA)
-    self.assertTrue(np.all(answer1 == result1))
+    assert (np.all(answer1 == result1))
 
     answer2 = np.array([[-36, -36],
                         [-18, -18],
                         [-30, -30],
                         [0, 0],
                         [-18, -18]])
     result2 = a.array_work(2, 2, 6, matrixA)
-    self.assertTrue(np.all(answer2 == result2))
+    assert (np.all(answer2 == result2))
 
 
-def test_make_series(self):
+def test_make_series():
     result = a.make_series(7, 4, ['a', 'b', 'c', 'd'])
-    self.assertTrue(isinstance(result, pd.Series))
-    self.assertEqual(result['a'], 7)
-    self.assertEqual(result['d'], 10)
+    assert (isinstance(result, pd.Series))
+    assert (result['a'] == 7)
+    assert (result['d'] == 10)
 
     result = a.make_series(22, 5, ['a', 'b', 'c', 'd', 'hi'])
-    self.assertEqual(result['a'], 22)
-    self.assertEqual(result['d'], 25)
-    self.assertEqual(result['hi'], 26)
+    assert (result['a'] == 22)
+    assert (result['d'] == 25)
+    assert (result['hi'] == 26)
 
 
-def test_data_frame_work(self):
+def test_data_frame_work():
     df = pd.DataFrame({'a': [1, 2, 3], 'b': [4, 5, 6]})
     colA, colB, colC = ('a', 'b', 'c')
-    a.data_frame_work(df, colA, colB, colC)
-    self.assertTrue(colC in df.columns.tolist())
-    self.assertEqual(df[colC].tolist(), [5, 7, 9])
+    result = a.data_frame_work(df, colA, colB, colC)
+    assert (colC in result.columns.tolist())
+    assert (result[colC].tolist() == [5, 7, 9])
 
 
-def test_boolean_indexing(self):
+def test_boolean_indexing():
     arr = np.array([[-4, -4, -3],
                     [-1, 16, -4],
                     [-3, 6, 4]])
     result1 = a.boolean_indexing(arr, 0)
     answer1 = np.array([16, 6, 4])
-    self.assertTrue(np.all(result1 == answer1))
+    assert (np.all(result1 == answer1))
     result2 = a.boolean_indexing(arr, 10)
     answer2 = np.array([16])
-    self.assertTrue(np.all(result2 == answer2))
-'''
+    assert (np.all(result2 == answer2))