From bb0af12cfbd83ba9c1bb35d2fead7cb19e759ed5 Mon Sep 17 00:00:00 2001
From: tsb1995 <47466105+tsb1995@users.noreply.github.com>
Date: Fri, 20 Dec 2019 13:14:09 -0800
Subject: [PATCH] apply setup_symbols function to all other routes

---
 __pycache__/app.cpython-37.pyc | Bin 4830 -> 4758 bytes
 app.py                         |  35 ++++++++++++++++++++-------------
 2 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/__pycache__/app.cpython-37.pyc b/__pycache__/app.cpython-37.pyc
index a81c4b681e39cccb89fb902403f56beaea9b79f6..62432a82435ad2e5eb7f3f51989aa7319970711c 100644
GIT binary patch
delta 1713
zcmZvc%WoT16vpqF_dB+mhvS4inn#;Z5hYa$p)A_asvxAa5TI=!0ypD=+xU^|33ALG
zd11sZRi!Jj03?!aH<ZVc1*@+33r2!P7f6T=Vg*Pb&KXBZgBWYR`#5K=XYTJi_ot~(
zru=2!cNktDE&aXz$5;NZ0M0jmf`k(RPBwBBQXItt2Rv1Np-##rC6*t!6SA&do8WyI
z=KUyZcDWjr-s8on#Pc+%qRgm#Q2wUPTpPo|f7Y_p04xX;K8&%JHOI@PO0inqz)^bj
zp!#^fh<D?6U@T&HAcVWhec(UKd;ZJvTfNp6tOGHN%(T^oDwI4E+7OG4$m+1z6cGC9
zBbnw{WQT#!I?5%so{KGE?m5B`RxjHJU|WA(XPDcQ<}Np<pUBN0<%XF7*3G{UThrHB
z)TTeNo0G!CMTcWYust{OgtM>2uCVbBTv{BHS1_4!z2=y(F*hIk!WTv_!#wYaycXv9
z!o!aW4qyFI6ogr!3lIu^poTAP3R`$02y+X&?kdCZiT@8%v}$3zw*#vzWUFkZPuATT
z`LX#xE?QGCD&Mkppid^&#CnP?Q5)NpF1sE+h+EG`NhU}pNv23LB-13PP!cHf)70wa
zYJEFOw5U|6^BI~kYTFS`@maZM4;c$M)p$*QXio;JrCZ>Efwsy(PJU@mo?XOf%bcqe
zo0amB4akKa-l+{XkK5o~w82&RhBJO(1KfQxvi2cXBOCWx6B_O;5wSvhUm+6dyx!~=
z8ZroCL+E6J)Bq3B05k#`rM;sk%;rg<;}Zq6Lb{%?kg%Ov$j1CO+j@-PJYga@2LV#+
zMnURI4_g(-YV%~&gZ=|tsQ+yx_R*t(Fgk!p{TIk2v$#ekbPz3JCfvGk5w;V$yAE>B
zglLQdj{XX#>flr+Eh*d)cuIcej=_lh&K;MJ-7`j)ne6q>K~}!v4a)B|eY9S_z0)n)
z0eU*E)HBq3hGb5*y@__v1%JdmOR;k#&!VhZjoRjRRIXL|5)Ko4qgV~gAr<~v%6XpT
zIg->S^VG8sh0dD9=t91W{l*0prg+^GhE5q99MwZtWK=otKfOTlmN8eX^ICI*a_O@0
zrj=4xoIdV~VRXg&@*jVw{b{6yc8C?f%7k*qY&^iRb1-ImR)pwc6@faDjo1}5jC$DD
zk$@h#Lg@f1bRdtFKS1Y-mr^ycO{rpwOk)jOWQlP<Bxb6B3<AVOgb{kX7UJ_|=q}11
zgO}uNkAMJ~6y8kF&-3^tcz!nCscu(pl{h~_Gl!8xzr9&2M(HWrtxT&6=pqLBGD!-E
z_JUs`xhw}VBjcZAw?Wj7?QXic9(anS${U$cxFVaGhuKGzYoxgj7A0SiOWB)a^j_Ul
z0d^8-B@iWWBY~R<tR?U|y5;NaboK{&lz1?()B<vozhqy{BxYl$a;vu4=vwTmyqFt5
umFOJLgA#XX-2%xl2^BuSKyrm-Mc&Ju?^E+iPAlZ_w^W!f%vy%!IPfpu;c>PA

delta 1820
zcmY*ZO>9(E6n^*3`~RDnGL&&jVG3=ffYL$`6c&Pr5RC*&K#5fb?o<XkGwpqE%s}o-
z7j@f&<R*rVk+Njv&qm|Ml{*tRZe~GTYfLb4W1`0Iyf?NmFYlat&(D2x&-b14>D1$?
z@N^h@8h+`~e-`$A8UDtY`}JQ;v27uY@d&wePY;;K0$qJxm>e@;G4Z~JH(r8Bv|Eg`
z+q$@>9v3EG<>neoSz<{IT1#xHJ#Zx3VA$!jgDxa4w`4);++HutYuGt!Y+mEqyf)*i
zZZuO6RZTUFca9G1_)hzJcPY*m%dN#bVicde>b5#b^CQtnnxcUHj3J(bLKeiB`mtF3
z!2ds@)$QzpIj%qquTlt@gD0X_7v#O`91^W&yV2>~pfLKC@KO!3d;ZO~?s<=iC+cE&
zUfnmlt31Sg%;CK>x>Hq?#+a5`iId&cPTVyuMFn_tTSscGzbEl{Q5tLd8Ev7Gy3%>z
zOG~;HZG$oG9$V3`XoxOl(QoyqpNg(-Mf36w4H>I>%Ip;s5ufq;lhVPlJ5wKJ52Pvm
z4LuE{hff5<<KG>|hW)zq5L-<n8A+?6AufC>?i0j?lCD?W{PRC05g(DZWKzdf4QZW}
zj`U<Gi+tO<4<sXAdD{J~x8uOSeG}<XLRww3ADJ0$%5$dJgqn5kSUXX6F|Hmtdlv?U
zxYy1xF69_ckaLQ}G>PX)WVr966`>|(AO@@@_LDYSo#kFKFp_3_SsWmX)$JuPiGymt
zJ7yh%DZZrMbSFz0E5HrI0^LijqEdJA$T9fu+K1YWe!I2Bjv}l9-i#f|v+TGDc3e<<
zy@^%sW^6a}UH~MvENrmUNF0D=O7npWn<oq0+t3M~%x?8Zr3ql7)Rq<^Z1Svp16I%u
zoy79hR)*8xBQ0dqz>n-a=>m37t~yBYvh-hprZ3TEsh<Ry4uCE-V+d_P8z5#R(Y!cl
z^nE?W=i#x}7+4gYBw`-M8Aa{`ZUZ*rfF*I3^m(xE0sJC0!?2B`w?(L_IGWPMZq@MX
z({(E2Si2V|^<~lhxW$|GMyK9eUT%u|^=_}ja}qrCU$Am;)zAJ*tfUr-wc0pxMMjDp
zw0e=mEQvXFKG=Jym=j}*6B!-K6mXox%Me$cxVzL#Fbu>AYzOX*Mu)dJ4UnT0bCSd>
zBr*maQQrkMYZ3eSwECmCT|Eg*#?+s|0d`8&!^*e|7tPHK|Ji5pp9KClogwy?`ZgR}
zeV7>B<LLQ$P3pJo_$%!F;hyGW#tLBPqOBOPGo`V)woq&<@ua@SATdX)==>cT;6alE
zI0rfd5SnJM2@Tlb4>-YNNVXGL;Sg!_aNPk?0gpD3DxwWnhAsF@Bw0u$znr%qE{IVZ
zf7t1@uQ!Frsy_$gz+7DFHj-=>=gsNn7@USvP)+id%rH1Z+t*2)#bn-P-N!OMj;dD8
ztl?Bp+Re_XgQYLZ-;>LNz@TOp6BpF)rT5sldZWCH&8fxmbomF0a3}(~HCEEqXXT4_
zPL8Vjw>)uBT!wRC3N(3B_*jb?37YbPdRd$zagM|Vb#~;$cD<^P7_~B<W3|JzeU9b0
G9{UeMYLZO=

diff --git a/app.py b/app.py
index f2a466a..139d12d 100644
--- a/app.py
+++ b/app.py
@@ -4,6 +4,7 @@ from helpers import apology
 
 app = Flask(__name__)
 
+# Convert our commonly used variables into sympy symbols
 x, y, z, t, X, Y, Z, T = symbols('x y z t X Y Z T')
 
 @app.route('/')
@@ -18,6 +19,7 @@ def differentiation():
             return apology("must provide a function", 400)
         f = request.form.get("function")
 
+        # Setup our symbols for SymPy
         f = setup_symbols(f)
 
         # Differentiate and return latex expressions
@@ -33,11 +35,12 @@ def integration():
         # Check if inputs were given
         if not request.form.get("function"):
             return apology("must provide a function", 400)
+        f = request.form.get("function")
+
+        # Setup our symbols for SymPy
+        f = setup_symbols(f)
 
         # Integrate and return latex expressions
-        f = request.form.get("function")
-        x = symbols('x')
-        f = sympify(f)
         fintegral = latex(f.integrate(x))
         value = latex(f)
         return render_template("integrated.html", value=value, fintegral=fintegral)
@@ -59,19 +62,21 @@ def riemann():
         if not request.form.get("sumtype"):
             return apology("must choose left or right", 400)
 
-        # Get inputs, check for validity and sympify
+        # Get our info from form
         f = request.form.get("function")
         sumtype = request.form.get("sumtype")
         lb = int(request.form.get("lowerbound"))
         ub = int(request.form.get("upperbound"))
         si = int(request.form.get("subintervals"))
-        x = symbols('x')
-        f = sympify(f)
-        dx = (ub - lb) / si
-        value = latex(f)
+
+        # Setup our symbols for SymPy
+        f = setup_symbols(f)
 
         # Run through Riemann Sum algorithm, creatings lists for display
         #           of inputs, outputs, and areas (their products)
+
+        value = latex(f)
+        dx = (ub - lb) / si
         inputs = list()
         if sumtype == "1":
             for i in range(0, si):
@@ -115,9 +120,8 @@ def maxmin():
         lb = sympify(request.form.get("lowerbound"))
         ub = sympify(request.form.get("upperbound"))
 
-        # Prep input for numpy / sympy
-        x = symbols('x')
-        f = sympify(f)
+        # Setup our symbols for SymPy
+        f = setup_symbols(f)
 
         # Get Derivative, solve for real solutions, update candidates list
         fprime = f.diff(x)
@@ -164,8 +168,10 @@ def aprox():
         f = request.form.get("function")
         a = request.form.get("easy")
         h = request.form.get("hard")
-        x = symbols('x')
-        f = sympify(f)
+        # Setup our symbols for SymPy
+        f = setup_symbols(f)
+
+        # Make sure a and h are numbers
         a = sympify(a)
         h = sympify(h)
         if not a.is_number:
@@ -197,9 +203,10 @@ def errorhandler(e):
 
 def setup_symbols(f):
     f = sympify(f)
+
+    # replace commonly used variables with x
     for letter in [x, y, z, t, X, Y, Z, T]:
         f = f.subs(letter, x)
-
     return f