Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

add trapz rule project #102

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions students/tsegas/session04/dict_lab.py
Original file line number Diff line number Diff line change
Expand Up @@ -8,5 +8,14 @@
my['fruit'] = 'mango'
print("print the dict",my)

print("print the dictionary keys",my.keys())
print("print the dictionary values",my.values())

a = "chocolate" in my
print("is chocolate a key in the dictionary?",a)

b = "fruit" in my
print("is Mango a value in the dictionary?",b)

cpy_my = my.copy()
print("print the dict",cpy_my)
40 changes: 40 additions & 0 deletions students/tsegas/session06/trapz_rule.py
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
#
# Trapazoid rule project: uses f(x) = x**2 as a function to be passed to the trapz function

import random
import string
import sys

# The function that will be passed to trapz
def f(x):
# f(x) = x**2 is used as an equation
y = x ** 2
return y

def trapz(func, start, end):
#Compute the area under the curve defined by
#y = fun(x), for x between a and b

N = 100 #max
x = 0
first = 0
for x in range(0, N):
if first ==0:
first = 1
summ = f(x)
#print('summ at 0....',summ)
#print('x at 0....',x)
else:
#print('x at N0....',x)
summ = summ + (2*f(x))
#print('x at N0....',x)
#f = f + x
#print('summ...',summ)
area = (((end-start))/2*N)*summ

return area

area = trapz(f, 5, 10)
print("The area under the curve from {} to {} is {}: ".format(5,10,area),'\n')