From 093634ae0d2b9aabcc290ba865f4ce1c7c54661d Mon Sep 17 00:00:00 2001
From: Yevgeny Khessin <khessiny@adriatic.cse.msu.edu>
Date: Thu, 24 Jan 2013 15:23:25 -0500
Subject: [PATCH 1/2] Testing update

---
 sieve_gen/sieve.py | 17 +++++++++++++++++
 sieve_itr/sieve.py | 14 ++++++++++++++
 sieve_mod/sieve.py | 13 +++++++++++++
 3 files changed, 44 insertions(+)
 create mode 100644 sieve_gen/sieve.py
 create mode 100644 sieve_itr/sieve.py
 create mode 100644 sieve_mod/sieve.py

diff --git a/sieve_gen/sieve.py b/sieve_gen/sieve.py
new file mode 100644
index 0000000..c2ec5f7
--- /dev/null
+++ b/sieve_gen/sieve.py
@@ -0,0 +1,17 @@
+# this is an implementation of the 'sieve' functionality using
+# a generator.
+
+def fib():
+    last_1 = 1
+    last_2 = 1
+
+    while 1:
+        next_fib = last_1 + last_2
+        last_1, last_2 = last_2, next_fib
+        yield next_fib
+
+# additional questions to address:
+# - could you swap the last two lines of the while statement?  what are the
+#    plusses and minuses of doing so?
+# - is there a way to condense the 'while' loop into two statements? try
+#    getting rid of the next_fib variable.
diff --git a/sieve_itr/sieve.py b/sieve_itr/sieve.py
new file mode 100644
index 0000000..38835b5
--- /dev/null
+++ b/sieve_itr/sieve.py
@@ -0,0 +1,14 @@
+# this is an implementation of the 'series' functionality using
+# Python's iterator functionality.  Here, 'adder' is a class that
+# obeys the iterator protocol.
+
+class adder(object):
+    def __init__(self):
+        self.n = 0
+
+    def __iter__(self):
+        return self
+
+    def next(self):
+        self.n += 1
+        return self.n
diff --git a/sieve_mod/sieve.py b/sieve_mod/sieve.py
new file mode 100644
index 0000000..5da6adc
--- /dev/null
+++ b/sieve_mod/sieve.py
@@ -0,0 +1,13 @@
+# this is an implementation of the 'series' functionality using a module.
+
+n = 0
+
+def add_one():
+    global n
+    n = n + 1
+    return n
+
+# additional questions to address:
+#  - what does 'global' do, above?
+#  - what naming limitations are there on series.py? Could we name it
+#        series_mod.py or series-mod.py, and still have it work as a module?

From 5805db03be0d2227e20b031a1025b020a697540d Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: Thu, 24 Jan 2013 21:15:20 -0500
Subject: [PATCH 2/2] Yevgeny Khessin Homework 1

---
 series_mod/example.py |   0
 series_mod/series.py  |   0
 sieve_gen/example.py  |   8 ++++++++
 sieve_gen/sieve.py    |  31 +++++++++++++++++--------------
 sieve_gen/sieve.pyc   | Bin 0 -> 657 bytes
 sieve_gen/test1.py    |  17 +++++++++++++++++
 sieve_gen/test2.py    |  19 +++++++++++++++++++
 sieve_gen/test3.py    |  18 ++++++++++++++++++
 sieve_itr/example.py  |   8 ++++++++
 sieve_itr/sieve.py    |  39 ++++++++++++++++++++++++++++-----------
 sieve_itr/sieve.pyc   | Bin 0 -> 1176 bytes
 sieve_itr/test1.py    |  17 +++++++++++++++++
 sieve_itr/test2.py    |  19 +++++++++++++++++++
 sieve_itr/test3.py    |  18 ++++++++++++++++++
 sieve_mod/example.py  |  13 +++++++++++++
 sieve_mod/sieve.py    |  28 ++++++++++++++++++----------
 sieve_mod/sieve.pyc   | Bin 0 -> 657 bytes
 17 files changed, 200 insertions(+), 35 deletions(-)
 mode change 100644 => 100755 series_mod/example.py
 mode change 100644 => 100755 series_mod/series.py
 create mode 100644 sieve_gen/example.py
 create mode 100644 sieve_gen/sieve.pyc
 create mode 100644 sieve_gen/test1.py
 create mode 100644 sieve_gen/test2.py
 create mode 100644 sieve_gen/test3.py
 create mode 100644 sieve_itr/example.py
 create mode 100644 sieve_itr/sieve.pyc
 create mode 100644 sieve_itr/test1.py
 create mode 100644 sieve_itr/test2.py
 create mode 100644 sieve_itr/test3.py
 create mode 100644 sieve_mod/example.py
 create mode 100644 sieve_mod/sieve.pyc

diff --git a/series_mod/example.py b/series_mod/example.py
old mode 100644
new mode 100755
diff --git a/series_mod/series.py b/series_mod/series.py
old mode 100644
new mode 100755
diff --git a/sieve_gen/example.py b/sieve_gen/example.py
new file mode 100644
index 0000000..3beadb4
--- /dev/null
+++ b/sieve_gen/example.py
@@ -0,0 +1,8 @@
+#Yevgeny Khessin
+#A39652176
+#HW1
+# an implementation of Eratosthenes' Sieve using a Python generator
+import sieve
+#create zip of 1 through 4, and run sieve on it, printing results
+for n, i in zip(range(4), sieve.sieve()):
+    print i
\ No newline at end of file
diff --git a/sieve_gen/sieve.py b/sieve_gen/sieve.py
index c2ec5f7..9352ef7 100644
--- a/sieve_gen/sieve.py
+++ b/sieve_gen/sieve.py
@@ -1,17 +1,20 @@
-# this is an implementation of the 'sieve' functionality using
-# a generator.
+#Yevgeny Khessin
+#A39652176
+#HW1
+# an implementation of Eratosthenes' Sieve using a Python generator
 
-def fib():
-    last_1 = 1
-    last_2 = 1
+def primecheck(primes, n): #function defition of checking if number is prime
+    for i in primes:   #for all numbers in primes list 
+        if n % i == 0:  #if modulus is 0 
+            return False   #return false
+    return True  #if not, return true
 
-    while 1:
-        next_fib = last_1 + last_2
-        last_1, last_2 = last_2, next_fib
-        yield next_fib
+def sieve():   #sieve function 
+    listprimes = [2]  #list of primes starting at 2 
+    counter = listprimes[-1] + 1   #go one back and add 1 
+    while 1: #endless while loop 
+        if primecheck(listprimes, counter):  #check if number is prime 
+            listprimes.append(counter)  #add it to list
+            yield counter  #return the value 
 
-# additional questions to address:
-# - could you swap the last two lines of the while statement?  what are the
-#    plusses and minuses of doing so?
-# - is there a way to condense the 'while' loop into two statements? try
-#    getting rid of the next_fib variable.
+        counter += 1   #increment counter
\ No newline at end of file
diff --git a/sieve_gen/sieve.pyc b/sieve_gen/sieve.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..711aac89e18169282affe403d772ad15fce9f728
GIT binary patch
literal 657
zcmbtRT}uK%6uo!1{35L<B_DgThuVZ7f{>u-(MY2ph_Ky3Cw0}G+0f9Z`j`ETen6c&
z8vXzW?wNDva_7!D<Np*3m2bWaX|)*pCBl>e5z!aX69_xP6nWIH`6z`RK#0T@!W;so
z2Q(+Tey-BOqdC*uqcVE?9wk|_MD0nI9xdYzX>V!(Icm4TZaM>_>=xL4k}5aGW{`~&
zJyZs5M6p9%10@IM1T096N`ih*8KdJ_5E^xQUO$S{;j2nM0;AQtdg-co$&SY}TR@Y$
zHSDRdFEdOIKwRWK&T%OGU!WxB762h#rUi*a_^==OR9P@h>!J*2(EACY4dHLlj+BY9
zJ#g%*XgEW|q$<X?Ya+C%WsLsC(xT6q(GoM9^3Hgy;%MoRym_FFUAd7(8jjM~s$^3)
uWSlc;M@R`koaYkzybD8eUUU7bRvyLmybZoU{Jt2DqI94d?gPY#eC7{iXMkn^

literal 0
HcmV?d00001

diff --git a/sieve_gen/test1.py b/sieve_gen/test1.py
new file mode 100644
index 0000000..74ca799
--- /dev/null
+++ b/sieve_gen/test1.py
@@ -0,0 +1,17 @@
+#Yevgeny Khessin
+#A39652176
+#HW1
+#test1
+import sieve
+#run once to check if value produced is 3. 
+def test1():
+    s = sieve.sieve() #make a sieve object from file sieve
+    i = iter(s) #make iterator
+    val=i.next() #run iterator once, put value in val 
+    assert val == 3 #check if value is 3. if not 3, fail.
+    print "Value should be 3, actual value is:"
+    print val
+
+
+#call test
+test1()
\ No newline at end of file
diff --git a/sieve_gen/test2.py b/sieve_gen/test2.py
new file mode 100644
index 0000000..2181197
--- /dev/null
+++ b/sieve_gen/test2.py
@@ -0,0 +1,19 @@
+#Yevgeny Khessin
+#A39652176
+#HW1
+#test1
+import sieve
+#run 3 times to check if value is  7
+def test2():
+    s = sieve.sieve() #make a sieve object from file sieve
+    i = iter(s) #make iterator
+    val=i.next() #run iterator once, put value in val 
+    val=i.next() #run iterator once, put value in val 
+    val=i.next() #run iterator once, put value in val     
+    
+    assert val == 7 #check if value is 7. if not 7, fail. 
+    print "Value should be 7, actual value is:"
+    print val
+
+#call test
+test2()
\ No newline at end of file
diff --git a/sieve_gen/test3.py b/sieve_gen/test3.py
new file mode 100644
index 0000000..bd68376
--- /dev/null
+++ b/sieve_gen/test3.py
@@ -0,0 +1,18 @@
+#Yevgeny Khessin
+#A39652176
+#HW1
+#test3
+import sieve
+#run once to make sure iterator is not at 2
+def test3():
+    s = sieve.sieve() #make a sieve object from file sieve
+    i = iter(s) #make iterator
+    val = i.next() #run iterator once, put value in val
+
+    assert val != 2 #check if value not 2 
+    print "Value should not be 2, actual value is:"
+    print val
+
+
+#call test3
+test3()
\ No newline at end of file
diff --git a/sieve_itr/example.py b/sieve_itr/example.py
new file mode 100644
index 0000000..a3c66eb
--- /dev/null
+++ b/sieve_itr/example.py
@@ -0,0 +1,8 @@
+#Yevgeny Khessin
+#A39652176
+#HW1
+# an implementation of Eratosthenes' Sieve using a Python iterator
+import sieve
+#create zip of 1 through 4, and run sieve on it, printing results
+for n, i in zip(range(4), sieve.sieve()):
+    print i
\ No newline at end of file
diff --git a/sieve_itr/sieve.py b/sieve_itr/sieve.py
index 38835b5..c23bf19 100644
--- a/sieve_itr/sieve.py
+++ b/sieve_itr/sieve.py
@@ -1,14 +1,31 @@
-# this is an implementation of the 'series' functionality using
-# Python's iterator functionality.  Here, 'adder' is a class that
-# obeys the iterator protocol.
+#Yevgeny Khessin
+#A39652176
+#HW1
+# an implementation of Eratosthenes' Sieve using a Python iterator
+
+def primecheck(primes, n): #function defition of checking if number is prime
+    for i in primes:   #for all numbers in primes list 
+        if n % i == 0:  #if modulus is 0 
+            return False   #return false
+    return True  #if not, return true
+
+class sieve(object):
+    def __init__(self):  #initializtion
+     self.listprimes = [2] #list of primes starting at 2 
+
+    def __iter__(self): #iterator
+     return self   #returns itself
+
+    def next(self): #iterator next
+     counter = self.listprimes[-1] + 1  #go back 1 and add 1 
+     while 1: #endless while loop 
+         if primecheck(self.listprimes, counter): #if it is a prime number
+             self.listprimes.append(counter) #add it to the list 
+             return counter #return the value 
+         counter += 1 #increment counter
+
+
+
 
-class adder(object):
-    def __init__(self):
-        self.n = 0
 
-    def __iter__(self):
-        return self
 
-    def next(self):
-        self.n += 1
-        return self.n
diff --git a/sieve_itr/sieve.pyc b/sieve_itr/sieve.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..a6212a01fb27a905e5de9d4a961fbae4d04fedfb
GIT binary patch
literal 1176
zcmb_bO>fgc5S_6@(o{q$A1Z<)T+9Ii0ttZ-LM`Hg6bT!Ih=f+Dy``HEC-tsTTBWD(
zW4ZGK;LSJ`&a{?hJl@@zdGq!;{@L69_=Df)w0UB@U&H)8xPs_A(GUTXWjbUkB3W4z
zeI7<s#FQm1oXaCP$rRg%`TKCoyR;&D^W_emMYLjCMYM}TlZdJg1)}V@L!SbphNKT1
z9BCM?AbLBRdK;wrhpM)TR1R&pMdfDJBaNt3?-GQh&Obubuf47MlOyZBD^L2lw@;rx
zeo)r416!T;y|dq}aiMCWhl`W2jU=s_AK82&J^U6NagTR+ixrKg<+3V|G~a_MNfr!&
zn1(8l!pd2^p=#KoG*k4sWQobNO41Gj9RCVxh>X(xhYLBA$YDh{bv`t6H*3O*x6{Lm
zPA+2_<4PBd=}Ap#OMH%004P#v2#lGwA2e-cGnERLgd*6=7@_1}6aq-DUQxV502E_o
z?KY%%>x^mngdl@v86sOlT`xADW0l>SiLsHvkn#*E$2aA=np+vTUwE7hqqmfH5TznO
zRoiH>uw|jD)LDaU=kvM*+KbLDq?UFWZs6^&!VzENn6E>1Elw1I&}&RNnptC13C7Ik
zMLor5+QnWf+D+x^{({lyzy5?&v@bxs1a0od-FVQja!$znU~KcCCoiLAkO^NlGriJZ
JPj0;1{tft-<az)A

literal 0
HcmV?d00001

diff --git a/sieve_itr/test1.py b/sieve_itr/test1.py
new file mode 100644
index 0000000..74ca799
--- /dev/null
+++ b/sieve_itr/test1.py
@@ -0,0 +1,17 @@
+#Yevgeny Khessin
+#A39652176
+#HW1
+#test1
+import sieve
+#run once to check if value produced is 3. 
+def test1():
+    s = sieve.sieve() #make a sieve object from file sieve
+    i = iter(s) #make iterator
+    val=i.next() #run iterator once, put value in val 
+    assert val == 3 #check if value is 3. if not 3, fail.
+    print "Value should be 3, actual value is:"
+    print val
+
+
+#call test
+test1()
\ No newline at end of file
diff --git a/sieve_itr/test2.py b/sieve_itr/test2.py
new file mode 100644
index 0000000..2181197
--- /dev/null
+++ b/sieve_itr/test2.py
@@ -0,0 +1,19 @@
+#Yevgeny Khessin
+#A39652176
+#HW1
+#test1
+import sieve
+#run 3 times to check if value is  7
+def test2():
+    s = sieve.sieve() #make a sieve object from file sieve
+    i = iter(s) #make iterator
+    val=i.next() #run iterator once, put value in val 
+    val=i.next() #run iterator once, put value in val 
+    val=i.next() #run iterator once, put value in val     
+    
+    assert val == 7 #check if value is 7. if not 7, fail. 
+    print "Value should be 7, actual value is:"
+    print val
+
+#call test
+test2()
\ No newline at end of file
diff --git a/sieve_itr/test3.py b/sieve_itr/test3.py
new file mode 100644
index 0000000..bd68376
--- /dev/null
+++ b/sieve_itr/test3.py
@@ -0,0 +1,18 @@
+#Yevgeny Khessin
+#A39652176
+#HW1
+#test3
+import sieve
+#run once to make sure iterator is not at 2
+def test3():
+    s = sieve.sieve() #make a sieve object from file sieve
+    i = iter(s) #make iterator
+    val = i.next() #run iterator once, put value in val
+
+    assert val != 2 #check if value not 2 
+    print "Value should not be 2, actual value is:"
+    print val
+
+
+#call test3
+test3()
\ No newline at end of file
diff --git a/sieve_mod/example.py b/sieve_mod/example.py
new file mode 100644
index 0000000..a1bba88
--- /dev/null
+++ b/sieve_mod/example.py
@@ -0,0 +1,13 @@
+#Yevgeny Khessin
+#A39652176
+#HW1
+
+import sieve
+#run 6 times
+print sieve.next()
+print sieve.next()
+print sieve.next()
+print sieve.next()
+print sieve.next()
+print sieve.next()
+
diff --git a/sieve_mod/sieve.py b/sieve_mod/sieve.py
index 5da6adc..3166669 100644
--- a/sieve_mod/sieve.py
+++ b/sieve_mod/sieve.py
@@ -1,13 +1,21 @@
-# this is an implementation of the 'series' functionality using a module.
+#Yevgeny Khessin
+#A39652176
+#HW1
+# an implementation of Eratosthenes' Sieve using a a Python module
 
-n = 0
+listprimes = [2]
 
-def add_one():
-    global n
-    n = n + 1
-    return n
+def primecheck(primes, n): #function defition of checking if number is prime
+    for i in primes:   #for all numbers in primes list 
+        if n % i == 0:  #if modulus is 0 
+            return False   #return false
+    return True  #if not, return true
 
-# additional questions to address:
-#  - what does 'global' do, above?
-#  - what naming limitations are there on series.py? Could we name it
-#        series_mod.py or series-mod.py, and still have it work as a module?
+def next(): #next definition 
+    counter = listprimes[-1] + 1 #
+    while 1:
+        if primecheck(listprimes, counter):
+            listprimes.append(counter)
+            return counter
+
+        counter += 1
diff --git a/sieve_mod/sieve.pyc b/sieve_mod/sieve.pyc
new file mode 100644
index 0000000000000000000000000000000000000000..2985750cb1039596ec79c177e04c09f35bb7c47a
GIT binary patch
literal 657
zcmbtRO-lnY6nx3neqpO#6uk(Z)<azjf(Rm_;;~>?5DFr7H`v&AyWM1^mG-3n!XM}l
z@CWF;wBTI>nKxNpUS?*!uUhrvQ`|(fTmtnR+w1~jq9;Ke5JB%m9YL{lL{jWg=oiqV
zB_Lw(mirRb>;ooyG$XpY-=VprnV^}ZO-$-b%1UI3!f}c2tiT|?-qHYa)UJSCcLzpU
ze&ROEmCw^{5s+qjs0^+VB@VR@N)F5+Sdbf)1^u2fMkmuCGV180*+}x?qsm?bqt%Og
z7>?ovJ4mOtic4;4)KgKvjFVv?Q4{N;EL=AH97}NKE<m6kUbYd))*MzF1TFXm!*B4{
zWd01-I0_OdAvT(i(LCPZWJ71ErN6N>k6&11F#~Pv!e*P3aJIW?s*>2}Mq2_zqdc)H
z`>%J-H&GK?M>VSe5_RE;HFz(`mXp-x)SZxa1?=}l$Nm;M=X;8ukPp-uk2kENA}hro
Dy!L<<

literal 0
HcmV?d00001