mirror of
https://github.com/TheAlgorithms/Python.git
synced 2024-11-24 05:21:09 +00:00
Merge branch 'master' of https://github.com/daniel-s-ingram/PythonAlgorithms
This commit is contained in:
commit
a872085183
|
@ -8,6 +8,8 @@ method 2:
|
|||
"Simpson Rule"
|
||||
|
||||
'''
|
||||
from __future__ import print_function
|
||||
|
||||
|
||||
def method_2(boundary, steps):
|
||||
# "Simpson Rule"
|
||||
|
@ -41,7 +43,7 @@ def main():
|
|||
steps = 10.0 #define number of steps or resolution
|
||||
boundary = [a, b] #define boundary of integration
|
||||
y = method_2(boundary, steps)
|
||||
print 'y = {0}'.format(y)
|
||||
print('y = {0}'.format(y))
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
|
@ -7,6 +7,7 @@ method 1:
|
|||
"extended trapezoidal rule"
|
||||
|
||||
'''
|
||||
from __future__ import print_function
|
||||
|
||||
def method_1(boundary, steps):
|
||||
# "extended trapezoidal rule"
|
||||
|
@ -39,7 +40,7 @@ def main():
|
|||
steps = 10.0 #define number of steps or resolution
|
||||
boundary = [a, b] #define boundary of integration
|
||||
y = method_1(boundary, steps)
|
||||
print 'y = {0}'.format(y)
|
||||
print('y = {0}'.format(y))
|
||||
|
||||
if __name__ == '__main__':
|
||||
main()
|
||||
|
|
|
@ -35,4 +35,4 @@ if __name__ == '__main__':
|
|||
n = int(sys.argv[1])
|
||||
print(sum_of_primes(n))
|
||||
except ValueError:
|
||||
print('Invalid entry - please enter a number.')
|
||||
print('Invalid entry - please enter a number.')
|
||||
|
|
|
@ -83,7 +83,7 @@ __Properties__
|
|||
|
||||
###### View the algorithm in [action][shell-toptal]
|
||||
|
||||
### Time-Compexity Graphs
|
||||
### Time-Complexity Graphs
|
||||
|
||||
Comparing the complexity of sorting algorithms (Bubble Sort, Insertion Sort, Selection Sort)
|
||||
|
||||
|
|
|
@ -1,3 +1,5 @@
|
|||
from __future__ import print_function
|
||||
|
||||
import sys
|
||||
'''
|
||||
Dynamic Programming
|
||||
|
|
Loading…
Reference in New Issue
Block a user