tsb95
/
taymath
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add rounding of digits to riemann and aprox routes

This commit is contained in:
tsb1995 2019-12-20 14:20:52 -08:00
parent 98f76f0cd3
commit a514d8d1c1
3 changed files with 11 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
__pycache__/app.cpython-37.pyc
View File

Binary file not shown.

20
app.py
View File

@ -76,23 +76,23 @@ def riemann():
# of inputs, outputs, and areas (their products) # of inputs, outputs, and areas (their products)
value = latex(f) value = latex(f)
dx = (ub - lb) / si dx = round((ub - lb) / si, 3)
inputs = list() inputs = list()
if sumtype == "1": if sumtype == "1":
for i in range(0, si): for i in range(0, si):
inputs.append(dx * (i)) inputs.append(round(dx * (i), 3))
if sumtype == "2": if sumtype == "2":
for i in range(0, si): for i in range(0, si):
inputs.append(dx * (i + 1)) inputs.append(round(dx * (i + 1), 3))
outputs = list() outputs = list()
for input in inputs: for input in inputs:
temp = f.subs(x, input) temp = f.subs(x, input)
outputs.append(temp) outputs.append(round(temp, 3))
rectangles = list() rectangles = list()
for output in outputs: for output in outputs:
temp = output * dx temp = output * dx
rectangles.append(temp) rectangles.append(round(temp, 3))
result = sum(rectangles) result = round(sum(rectangles), 3)
# Choose template based on left or right sum # Choose template based on left or right sum
if sumtype == "1": if sumtype == "1":
@ -179,11 +179,13 @@ def aprox():
if not h.is_number: if not h.is_number:
return apology("difficult value must be a number", 400) return apology("difficult value must be a number", 400)
a = round(a, 3)
h = round(h, 3)
# Run through Linearization algorithm # Run through Linearization algorithm
fprime = f.diff(x) fprime = f.diff(x)
fa = f.subs(x, a) fa = round(f.subs(x, a), 3)
fprimea = fprime.subs(x, a) fprimea = round(fprime.subs(x, a), 3)
lh = fa + fprimea*(float(h)-float(a)) lh = round(fa + fprimea*(float(h)-float(a)), 3)
# Convert to latex for MathJax reading # Convert to latex for MathJax reading
value = latex(f) value = latex(f)

8
helpers.py
View File

@ -2,7 +2,6 @@ import requests
from flask import redirect, render_template, request, session from flask import redirect, render_template, request, session
from functools import wraps from functools import wraps
from sympy import *
def apology(message, code=400): def apology(message, code=400):
@ -37,10 +36,3 @@ def login_required(f):
def usd(value): def usd(value):
"""Format value as USD.""" """Format value as USD."""
return f"${value:,.2f}" return f"${value:,.2f}"
def setup_symbols(f):
f = sympify(f)
for letter in [x, y, z, t, X, Y, Z, T]:
f = f.subs(letter, x)
return f