CSE491 Numberz

fib-fn.py

@@ -1,13 +1,13 @@
-last_1 = 1
-last_2 = 1
+last_1 = 1 		# define last_1 as 1
+last_2 = 1		# define last_2 as 1
 
 def next():
     global last_1, last_2
 
-    next_fib = last_1 + last_2
-    last_1, last_2 = last_2, next_fib
+    next_fib = last_1 + last_2			# set the next fib as the previous two fibonaccci numbers
+    last_1, last_2 = last_2, next_fib		# define last_1 as last_2, and set last_2 as next_fib
 
-    return next_fib
+    return next_fib				# print out the last_fib number
 
 print next()
 print next()

fib_iter/example.py

@@ -1,6 +1,6 @@
 import fib
 
-for n, i in zip(range(3), fib.fib()):
+for n, i in zip(range(5), fib.fib()):
     print i
 
 # additional questions to address:

iter_bug/fib.py

@@ -7,10 +7,10 @@ def __init__(self):
         self.last_1 = 1
         self.last_2 = 1
 
-    def __iter__(self):
+    def __iter__(self):	
         return self
 
     def next(self):
         next_fib = self.last_1 + self.last_2
-        self.last_1, self.last2 = self.last_2, next_fib
+        self.last_1, self.last_2 = self.last_2, next_fib
         return next_fib

iter_bug/test.py

@@ -1,22 +1,33 @@
 import fib
 
+#class fib(object):
+#    def __init__(self):
+#        self.last_1 = 1
+#        self.last_2 = 1
+
+#    def __iter__(self):	
+#        return self
+
+#    def next(self):
+#        next_fib = self.last_1 + self.last_2
+#        self.last_1, self.last2 = self.last_2, next_fib
+#        return next_fib
+
+
 def test1():
     f = fib.fib()
-    i = iter(f)
-    assert i.next() == 2
+    assert f.next() == 2
 
 def test2():
     f = fib.fib()
-    i = iter(f)
-    i.next()
-    assert i.next() == 3
+    f.next()
+    assert f.next() == 3
 
-def test2():
+def test3():
     f = fib.fib()
-    i = iter(f)
-    i.next()
-    i.next()
-    assert i.next() == 5
+    f.next()
+    f.next()
+    assert f.next() == 5
 
 test1()
 test2()

series_gen/series.py

@@ -6,3 +6,4 @@ def adder():
     while 1:
         n += 1
         yield n
+

series_iter/series.py

@@ -3,12 +3,12 @@
 # obeys the iterator protocol.
 
 class adder(object):
-    def __init__(self):
-        self.n = 0
+    def __init__(self):     # creates instance of adder class
+        self.n = 0          # sets the n value to 0 for 
 
     def __iter__(self):
-        return self
+        return self         # returns value of self
 
-    def next(self):
-        self.n += 1
+    def next(self):         # defines what happens when iterator happens
+        self.n += 1         # ADD 1 to n
         return self.n

series_mod/series.py

@@ -1,11 +1,11 @@
 # this is an implementation of the 'series' functionality using a module.
 
-n = 0
+n = 0               # n = 0
 
 def add_one():
-    global n
-    n = n + 1
-    return n
+    global n        # pull the n value
+    n = n + 1       # add 1 to the n 
+    return n        # return n value
 
 # additional questions to address:
 #  - what does 'global' do, above?

sieve-fn.py

@@ -20,3 +20,4 @@ def next():
 
 for n in range(10):
     print next()
+

sieve_gen/example.py

@@ -0,0 +1,4 @@
+import sieve
+
+for n,i in zip(range(10), sieve.sieve()):
+    print i

sieve_gen/sieve.py

@@ -0,0 +1,21 @@
+# a generator implementation of Eratosthenes' Sieve:
+#   http://en.wikipedia.org/wiki/Sieve_of_Eratosthenes
+
+def _is_prime(primes, n):
+    for i in primes:
+        if n % i == 0:
+            return False
+    return True
+
+def sieve():
+    _primeslist = [2]
+    start = _primeslist[-1] + 1
+
+    while 1:
+        if _is_prime(_primeslist, start):
+            _primeslist.append(start)
+            yield start
+
+        start += 1
+
+

sieve_gen/test1.py

@@ -0,0 +1,8 @@
+import sieve
+
+for n, i in zip(range(10), sieve.sieve()):
+    print i
+
+assert i == 31
+
+print "Test 1 Worked!"

sieve_gen/test2.py

@@ -0,0 +1,8 @@
+import sieve
+
+for n, i in zip(range(1), sieve.sieve()):
+    print i
+
+assert i == 3
+
+print "Test 2 Worked!"

sieve_gen/test3.py

@@ -0,0 +1,8 @@
+import sieve
+
+for n, i in zip(range(30), sieve.sieve()):
+    print i
+
+assert i == 127
+
+print "Test 3 Worked!"

sieve_iter/example.py

@@ -0,0 +1,4 @@
+import sieve
+
+for n, i in zip(range(10), sieve.sieve()):
+    print i

sieve_iter/sieve.py

@@ -0,0 +1,24 @@
+# an iterative implementation of Eratosthenes' Sieve:
+#   http://en.wikipedia.org/wiki/Sieve_of_Eratosthenes
+
+
+def _is_prime(primes, n):
+    for i in primes:
+        if n % i == 0:
+            return False
+    return True
+
+class sieve(object):
+    def __init__(self):
+        self._primeslist = [2]
+
+    def __iter__(self):
+        return self
+
+    def next(self):
+        start = self._primeslist[-1] + 1
+        while 1:
+	    if _is_prime(self._primeslist, start):
+	        self._primeslist.append(start)
+	        return start
+	    start += 1

sieve_iter/test1.py

@@ -0,0 +1,8 @@
+import sieve
+
+for n, i in zip(range(10), sieve.sieve()):
+    print i
+
+assert i == 31
+
+print "Test 1 Worked!"

sieve_iter/test2.py

@@ -0,0 +1,8 @@
+import sieve
+
+for n, i in zip(range(1), sieve.sieve()):
+    print i
+
+assert i == 3
+
+print "Test 2 Worked!"

sieve_iter/test3.py

@@ -0,0 +1,8 @@
+import sieve
+
+for n, i in zip(range(30), sieve.sieve()):
+    print i
+
+assert i == 127
+
+print "Test 3 Worked!"

sieve_mod/example.py

@@ -0,0 +1,5 @@
+import sieve
+
+
+for n in range(10):
+    print sieve.next()

sieve_mod/example.py~

@@ -0,0 +1,5 @@
+import sieve
+
+
+for n in range(10):
+    print next()

sieve_mod/sieve.py

@@ -0,0 +1,21 @@
+# an implementation of Eratosthenes' Sieve:
+#   http://en.wikipedia.org/wiki/Sieve_of_Eratosthenes
+
+_primeslist = [2]
+
+def _is_prime(primes, n):
+    for i in primes:
+        if n % i == 0:
+            return False
+    return True
+
+def next():
+    start = _primeslist[-1] + 1
+    while 1:
+        if _is_prime(_primeslist, start):
+            _primeslist.append(start)
+            return start
+
+        start += 1
+
+

sieve_mod/sieve.py~

@@ -0,0 +1,23 @@
+# an implementation of Eratosthenes' Sieve:
+#   http://en.wikipedia.org/wiki/Sieve_of_Eratosthenes
+
+_primeslist = [2]
+
+def _is_prime(primes, n):
+    for i in primes:
+        if n % i == 0:
+            return False
+    return True
+
+def next():
+    start = _primeslist[-1] + 1
+    while 1:
+        if _is_prime(_primeslist, start):
+            _primeslist.append(start)
+            return start
+
+        start += 1
+
+for n in range(10):
+    print next()
+