Merge pull request #100 from ryanmorin/master

PythonCHB · PythonCHB · commit e26d4e5875d4 · 2015-11-19T22:17:52.000-08:00
work review trapz.py
diff --git a/students/ryan_morin/session_05/trapz.py b/students/ryan_morin/session_05/trapz.py
@@ -0,0 +1,30 @@
+__author__ = 'ryan.morin'
+
+import math
+
+def sine(x):
+    return math.sin(x)
+
+def line(x):
+    return 5
+
+def quadratic(x, c=0, d=0, e=0):
+    return c * x**2 + d*x + e
+
+def trapz(fun, a, b, *args, **kwargs):
+    """
+    Compute the area under the curve from 'a' to 'b' for a function y = f(x)
+    :param fun: the function used for the calculation
+    :param a: the beginning point of the integration
+    :param b: the ending point of the integration
+    :return: the area of the function fun
+    """
+    total = 0.0
+    inc = float((b-a))/100
+    total += fun(a)/2.0
+    for i in range(1,100):
+        total += fun(a + (i * inc))
+    total += (fun(b)/2.0)
+    return total * inc
+
+print (trapz(lambda x: math.sin(x), 1,10))
diff --git a/students/ryan_morin/session_06/Labs.py b/students/ryan_morin/session_06/Labs.py
@@ -0,0 +1,37 @@
+y = 4
+def fun(x=y):
+    print ("x is:", x)
+
+fun()
+
+def f(*args, **kwargs):
+    print("the positional arguments are:", args)
+    print("the keyword arguments are:", kwargs)
+
+f(3,4,57,6, o=6, r=5)
+
+print ("My name is {first} {last}".format(last="Barker", first="Chris"))
+
+d = {"last":"Barker", "first":"Chris"}
+print("My name is {first} {last}".format(**d))
+
+def f(fore_color='w',back_color='x',link_color='y',visited_color='z'):
+    print (('{},{} -- {},{}').format(fore_color,back_color,link_color,visited_color))
+
+other = ('white', 'orange')
+other2 = {'link_color':'pink', 'visited_color':'jump'}
+print (other2['visited_color'])
+
+f(other2['visited_color'], *other,visited_color='yellow')
+
+def fun(x, a=None):
+    if a is None:
+        a = []
+    a.append(x)
+    print(a)
+
+fun(4)
+fun(10)
+
+l = [lambda x, y: x+y]
+print (l[0](2,3))
diff --git a/students/ryan_morin/session_06/trapz.py b/students/ryan_morin/session_06/trapz.py
@@ -0,0 +1,30 @@
+__author__ = 'ryan.morin'
+
+import math
+
+def sine(x):
+    return math.sin(x)
+
+def line(x):
+    return 5
+
+def quadratic(x, c=0, d=0, e=0):
+    return c * x**2 + d*x + e
+
+def trapz(fun, a, b, *args, **kwargs):
+    """
+    Compute the area under the curve from 'a' to 'b' for a function y = f(x)
+    :param fun: the function used for the calculation
+    :param a: the beginning point of the integration
+    :param b: the ending point of the integration
+    :return: the area of the function fun
+    """
+    total = 0.0
+    inc = float((b-a))/100
+    total += fun(a)/2.0
+    for i in range(1,100):
+        total += fun(a + (i * inc))
+    total += (fun(b)/2.0)
+    return total * inc
+
+print (trapz(lambda x: math.sin(x), 1,10))
