Changed xrange to range to be compatible with Python 3.

This commit is contained in:
Donne Martin
2015-07-06 06:15:53 -04:00
parent fac7bbb1be
commit 45fa576bc2
21 changed files with 41 additions and 42 deletions

View File

@@ -136,10 +136,10 @@
" assert_equal(dest.pop(), 5)\n",
"\n",
" print('Test: 2 or more disks')\n",
" for i in xrange(num_disks, -1, -1):\n",
" for i in range(num_disks, -1, -1):\n",
" src.push(i)\n",
" hanoi(num_disks, src, dest, buff)\n",
" for i in xrange(0, num_disks):\n",
" for i in range(0, num_disks):\n",
" assert_equal(dest.pop(), i)\n",
"\n",
" print('Success: test_hanoi')\n",

View File

@@ -153,10 +153,10 @@
" assert_equal(dest.pop(), 5)\n",
"\n",
" print('Test: 2 or more disks')\n",
" for i in xrange(num_disks, -1, -1):\n",
" for i in range(num_disks, -1, -1):\n",
" src.push(i)\n",
" hanoi(num_disks, src, dest, buff)\n",
" for i in xrange(0, num_disks):\n",
" for i in range(0, num_disks):\n",
" assert_equal(dest.pop(), i)\n",
"\n",
" print('Success: test_hanoi')\n",

View File

@@ -22,10 +22,10 @@ class TestHanoi(object):
assert_equal(dest.pop(), 5)
print('Test: 2 or more disks')
for i in xrange(num_disks, -1, -1):
for i in range(num_disks, -1, -1):
src.push(i)
hanoi(num_disks, src, dest, buff)
for i in xrange(0, num_disks):
for i in range(0, num_disks):
assert_equal(dest.pop(), i)
print('Success: test_hanoi')

View File

@@ -131,7 +131,7 @@
" def test_push_on_full(self, num_stacks, stack_size):\n",
" print('Test: Push to full stack')\n",
" stacks = Stacks(num_stacks, stack_size)\n",
" for i in xrange(0, stack_size):\n",
" for i in range(0, stack_size):\n",
" stacks.push(2, i)\n",
" stacks.push(2, stack_size)\n",
"\n",

View File

@@ -177,7 +177,7 @@
" def test_push_on_full(self, num_stacks, stack_size):\n",
" print('Test: Push to full stack')\n",
" stacks = Stacks(num_stacks, stack_size)\n",
" for i in xrange(0, stack_size):\n",
" for i in range(0, stack_size):\n",
" stacks.push(2, i)\n",
" stacks.push(2, stack_size)\n",
"\n",

View File

@@ -3,7 +3,7 @@ from nose.tools import raises
class TestStacks(object):
@raises(Exception)
def test_pop_on_empty(self, num_stacks, stack_size):
print('Test: Pop on empty stack')
@@ -14,7 +14,7 @@ class TestStacks(object):
def test_push_on_full(self, num_stacks, stack_size):
print('Test: Push to full stack')
stacks = Stacks(num_stacks, stack_size)
for i in xrange(0, stack_size):
for i in range(0, stack_size):
stacks.push(2, i)
stacks.push(2, stack_size)
@@ -36,11 +36,11 @@ class TestStacks(object):
def main():
num_stacks = 3
stack_size = 100
stack_size = 100
test = TestStacks()
test.test_pop_on_empty(num_stacks, stack_size)
test.test_push_on_full(num_stacks, stack_size)
test.test_stacks(num_stacks, stack_size)
if __name__ == '__main__':
main()

View File

@@ -142,10 +142,10 @@
"\n",
" print('Test: Two or more element stack (general case)')\n",
" num_items = 10\n",
" numbers = [randint(0, 10) for x in xrange(num_items)]\n",
" numbers = [randint(0, 10) for x in range(num_items)]\n",
" sorted_stack = self.get_sorted_stack(numbers)\n",
" sorted_numbers = []\n",
" for _ in xrange(num_items):\n",
" for _ in range(num_items):\n",
" sorted_numbers.append(sorted_stack.pop())\n",
" assert_equal(sorted_numbers, sorted(numbers, reverse=True))\n",
" \n",

View File

@@ -161,10 +161,10 @@
"\n",
" print('Test: Two or more element stack (general case)')\n",
" num_items = 10\n",
" numbers = [randint(0, 10) for x in xrange(num_items)]\n",
" numbers = [randint(0, 10) for x in range(num_items)]\n",
" sorted_stack = self.get_sorted_stack(numbers)\n",
" sorted_numbers = []\n",
" for _ in xrange(num_items):\n",
" for _ in range(num_items):\n",
" sorted_numbers.append(sorted_stack.pop())\n",
" assert_equal(sorted_numbers, sorted(numbers, reverse=True))\n",
" \n",

View File

@@ -3,7 +3,7 @@ from nose.tools import assert_equal
class TestSortStack(object):
def get_sorted_stack(self, numbers):
stack = MyStack()
for x in numbers:
@@ -22,13 +22,13 @@ class TestSortStack(object):
print('Test: Two or more element stack (general case)')
num_items = 10
numbers = [randint(0, 10) for x in xrange(num_items)]
numbers = [randint(0, 10) for x in range(num_items)]
sorted_stack = self.get_sorted_stack(numbers)
sorted_numbers = []
for _ in xrange(num_items):
for _ in range(num_items):
sorted_numbers.append(sorted_stack.pop())
assert_equal(sorted_numbers, sorted(numbers, reverse=True))
print('Success: test_sort_stack')
def main():