merge .gitignore

epequeno · Sep 8, 2016 · ef97936 · ef97936
2 parents c0ec34e + 7c77954
commit ef97936
Show file tree

Hide file tree

Showing 11 changed files with 1,295 additions and 31 deletions.
diff --git a/.gitignore b/.gitignore
@@ -2,3 +2,5 @@
 *.pyc
 .solutions
 venv2
+.ThinkPy-Solutions
+.ipynb_checkpoints
diff --git a/ch08/8.02.py b/ch08/8.02.py
@@ -12,11 +12,13 @@
 prefixes = 'JKLMNOPQ'
 suffix = 'ack'
 
+
 def ducks():
-    for i in prefixes:
-        if i == "O" or i == "Q":
-            print i + "u" + suffix
+    for p in prefixes:
+        if p in ['O', 'Q']:
+            yield '{}uack'.format(p)
         else:
-            print i + suffix
+            yield '{}ack'.format(p)
 
-ducks()
+for i in list(ducks()):
+    print i
diff --git a/ch08/8.06.py b/ch08/8.06.py
@@ -4,28 +4,36 @@
 
 @author: steven
 """
-
+# word = 'banana'
+# count = 0
+# for letter in word:
+#     if letter == 'a':
+#         count = count + 1
+# print count
 # Rewrite this function so that instead of traversing the string, it uses the
 # three-parameter version of find from the previous section.
 
 # Current Status: Complete
 
 
-def find(word, letter, index):
+def find(letter, word, index):
     while index < len(word):
         if word[index] == letter:
             return index
         index += 1
     return -1
 
 
-def count(word, letter):
-    count = 0
+def count(letter, word):
+    counter = 0
     index = 0
     while index < len(word):
-        if find(word, letter, index) != -1:
-            count += 1
-        index = find(word, letter, index) + 1
-    return count
+        result = find(letter, word, index)
+        if result == -1:
+            return counter
+        else:
+            counter += 1
+        index = result + 1
+    return counter
 
-print count("banana", "a")
+print count("n", "Think Python")
diff --git a/ch08/8.07.py b/ch08/8.07.py
@@ -11,11 +11,11 @@
 
 # Current Status: Complete
 
-word = "banana"
-letter = "a"
+w = "banana"
+l = "a"
 
 
 def count(word, letter):
     return word.count(letter)
 
-print count(word, letter)
+print count(w, l)