Web   ·   Wiki   ·   Activities   ·   Blog   ·   Lists   ·   Chat   ·   Meeting   ·   Bugs   ·   Git   ·   Translate   ·   Archive   ·   People   ·   Donate
summaryrefslogtreecommitdiffstats
path: root/data/math
diff options
context:
space:
mode:
Diffstat (limited to 'data/math')
-rw-r--r--data/math/factorial29
-rw-r--r--data/math/fibonacci4
-rw-r--r--data/math/guess23
-rw-r--r--data/math/pascal27
-rw-r--r--data/math/sierpinski37
-rw-r--r--data/math/times6
6 files changed, 63 insertions, 63 deletions
diff --git a/data/math/factorial b/data/math/factorial
index 93441b6..bbe5a20 100644
--- a/data/math/factorial
+++ b/data/math/factorial
@@ -1,34 +1,35 @@
import time
-# define a factorial function in recursive flavor
def factorial_recursive(number):
+ """ Define a factorial function in recursive flavor """
result = 1
if number > 0:
- result = number * factorial_recursive(number-1)
- print "factorizing: ", number, " result: ", result
+ result = number * factorial_recursive(number - 1)
+ print 'factorizing: ', number, ' result: ', result
return result
-# define a factorial function in iterative flavor
def factorial_iterative(number):
+ """ Define a factorial function in iterative flavor """
result = 1
- for i in range(1, number+1):
+ for i in range(1, number + 1):
result = result * i
- print "factorizing: ", i, " result: ", result
+ print 'factorizing: ', i, ' result: ', result
return result
def calculate(number, type):
+ """ Calculate factorial using recursive and iterative methods """
start = time.time()
if type == 0:
- type_s = "recursive"
- result = factorial_recursive(number)
+ type_s = 'recursive'
+ factorial_recursive(number)
else:
- type_s = "iterative"
- result = factorial_iterative(number)
+ type_s = 'iterative'
+ factorial_iterative(number)
delta = time.time() - start
- print "Type: ", type_s, " in: ", 1/delta
+ print 'Type: ', type_s, ' in: ', 1 / delta
-# ask for a number to factorize
-number = input("Please input a number:")
-print "Calculating..."
+# ask for a number to compute the factorial of
+number = input('Please input a number:')
+print 'Calculating...'
calculate(number, 0)
calculate(number, 1)
diff --git a/data/math/fibonacci b/data/math/fibonacci
index 9bc1acb..6cef209 100644
--- a/data/math/fibonacci
+++ b/data/math/fibonacci
@@ -1,4 +1,4 @@
a, b = 0, 1
while b < 1001:
- print b,
- a, b = b, a+b
+ print b,
+ a, b = b, a + b
diff --git a/data/math/guess b/data/math/guess
index 68c0760..14c6539 100644
--- a/data/math/guess
+++ b/data/math/guess
@@ -1,18 +1,19 @@
import random
import pippy
-R = random.randrange(1,100)
+R = random.randrange(1, 100)
-print "Guess a number between 1 and 100!"
-N = input("Enter a number: ")
-i=1
-while (N!=R):
- if N>R:
+print 'Guess a number between 1 and 100!'
+N = input('Enter a number: ')
+i = 1
+while (N != R):
+ if N > R:
pippy.console.red()
- print "Too big... try again"
+ print 'Too big... try again'
else:
pippy.console.blue()
- print "Too small.. try again"
+ print 'Too small.. try again'
pippy.console.black()
- N = input("Enter a number: ")
- i=i+1
-print "You got it in", i, "tries"
+ N = input('Enter a number: ')
+ i = i + 1
+
+print 'You got it in', i, 'tries'
diff --git a/data/math/pascal b/data/math/pascal
index 359acdd..06fab84 100644
--- a/data/math/pascal
+++ b/data/math/pascal
@@ -1,19 +1,18 @@
# Pascal's triangle
lines = 9
-
vector = [1]
-for i in range(1,lines+1):
- vector.insert(0,0)
- vector.append(0)
+for i in range(1, lines + 1):
+ vector.insert(0, 0)
+ vector.append(0)
-for i in range(0,lines):
- newvector = vector[:]
- for j in range(0,len(vector)-1):
- if (newvector[j] == 0):
- print " ",
- else:
- print "%2d" % newvector[j],
- newvector[j] = vector[j-1] + vector[j+1]
- print
- vector = newvector[:]
+for i in range(0, lines):
+ newvector = vector[:]
+ for j in range(0, len(vector) - 1):
+ if (newvector[j] == 0):
+ print ' ',
+ else:
+ print '%2d' % newvector[j],
+ newvector[j] = vector[j - 1] + vector[j + 1]
+ print
+ vector = newvector[:]
diff --git a/data/math/sierpinski b/data/math/sierpinski
index 8b5f291..1c0b89e 100644
--- a/data/math/sierpinski
+++ b/data/math/sierpinski
@@ -1,26 +1,25 @@
# Sierpinski triangles
-import sys
size = 3
modulus = 2
-lines = modulus**size
+lines = modulus ** size
vector = [1]
-for i in range(1,lines+1):
- vector.insert(0,0)
- vector.append(0)
+for i in range(1, lines + 1):
+ vector.insert(0, 0)
+ vector.append(0)
-for i in range(0,lines):
- newvector = vector[:]
- for j in range(0,len(vector)-1):
- if (newvector[j] == 0):
- print " ",
- else:
- remainder = newvector[j] % modulus
- if (remainder == 0):
- print "O",
- else:
- print ".",
- newvector[j] = vector[j-1] + vector[j+1]
- print
- vector = newvector[:]
+for i in range(0, lines):
+ newvector = vector[:]
+ for j in range(0, len(vector) - 1):
+ if (newvector[j] == 0):
+ print ' ',
+ else:
+ remainder = newvector[j] % modulus
+ if (remainder == 0):
+ print 'O',
+ else:
+ print '.',
+ newvector[j] = vector[j - 1] + vector[j + 1]
+ print
+ vector = newvector[:]
diff --git a/data/math/times b/data/math/times
index b764ac0..4757a4a 100644
--- a/data/math/times
+++ b/data/math/times
@@ -1,3 +1,3 @@
-number = input("Which times table? ")
-for i in range(1,13):
- print i, "x", number, "=", i*number
+number = input('Which times table? ')
+for i in range(1, 13):
+ print i, 'x', number, '=', i * number