From 8a58fe28fa7c1c99f4522c48f3b3d43f76a2da2e Mon Sep 17 00:00:00 2001
From: ltcptgeneral <35508619+ltcptgeneral@users.noreply.github.com>
Date: Thu, 29 Nov 2018 12:58:53 -0600
Subject: [PATCH] analysis.py - v 1.0.7.002

changelog:
	- bug fixes
---
 .../__pycache__/analysis.cpython-37.pyc       | Bin 26862 -> 27055 bytes
 data analysis/analysis.py                     |  82 +++++++++++-------
 2 files changed, 52 insertions(+), 30 deletions(-)

diff --git a/data analysis/__pycache__/analysis.cpython-37.pyc b/data analysis/__pycache__/analysis.cpython-37.pyc
index d42293128a198043eeca5ac0c34c81742a74447d..3cbcb65a3cc3f322867e9f85d5ace775b8a0c797 100644
GIT binary patch
delta 2217
zcmaJ>dr(wm6u;-&ySta=A?_jzvciIhyGAScN?`#*G!#-$6af(yE-XwwhPzk9+Lem5
zoUw7_%w%I}W|K8N#>cJc53@;9$9#;EHad(>X60*ahid$z$)?VCu~pG&@9b~C?>oQm
zobx;9><#zB-g6LF92;v9=yPGJu&i?Z{<zJ|mFt@$2|{z5Z<W7g#cF?^CD)VVdCHTM
zlbdIWdeYgn#_w!x?`jEXAF*l+Y}8n6H^3(C<+w1wZtRHv684~HWEl2pW2}n-zR&`;
zXn@n$o$w}nk4d9mf$iFkQFj2YAlmoC&p12j3f$JRlFI?^Xo1l&0MYnj%2u$U)v*CC
z;*L>vZLi}KfK*(Tx)U<+uhgU9)()p-1LR=X`6ra%jr5IBj;k})gIx<}YzJ6^n=;>q
zTFe^P2R=NUX4CGDa|5(t*7&;+!m+MbVFP~b>V^dv&Pc`*_XqHrcH4bcgxB$q=N4Sm
zKAc#@;F@+LcN)M5Ep768130vu(?Seppkqdn#Y|<JMc=?QY?*PfuvisjqY6Qx2V~Y`
zC=u#CAwy6I8j^*Od0m2PmZO43yC6$;Vt`OBbX)_0KQ**kitTx~Om&RBO~9Ibr^FZ}
zfC()4LVk+lDn;=NAwyS*Dhx&F0rEd3B(BTAefg;)$eA_b%(@g$=g%xCe2D7_iIj^-
zxk!30MwRlAO_5xBBiDPE3LU*TqA-!E5>|NUV0&Ra?(rr=Hy-rnm}`w44FOfbL9fdd
z<oRY&asm^X6&Pgjlvy0OfbSm`K}sJK0X_6YM6?$?Dq>^7^8Xbf$x@I6$Wajy`ywLt
zk%)aH;z!rE$LE*?-eEb$6s5o^bQLLig{nz4^FHbcdO{|uoatT{CD{@bDQI*gXfP5q
zxD@+}w!&vx)l3Fu2YBGodT}H%>%VYRB)zZ9LWNSckhz(7`iK9D^wno7h8C)@3xYII
z@8Ua8J3LJ3qO$?B>QnqJYCv()ZV1x(Dvsbd52?FjI5IY|u$0bZ2(hkgnoXd|Aw~CQ
zGl^ys_-qbMXp$fsY(j{2BvuP5Qw_VsAj8sPuO#YGm94n7I3xNL_fPKz>bLfFu><Ju
ze0kOuxUQ`%i4x&=ZEdNUL9y074*=@4m&&{Ve*CK3W#MXcS;g95`CEo8IbNP6m&h~a
ziGGV5EnDSW+Rc{d$j``A<WhMqotkAc?x>hJb)H>NM+Hs6sAOsg6@F-M9=4bGUM4w1
z9E8f`#7otJEG!b-W%HkxWS{EuGzU7LcVcd3nzo?w1f-cLshj*yeAC7ukwYp6FNX@u
zToeWsZB?~Uh^wmFM)uM10mHotOQ7^=*Q=@kj-hwSHaLRkmz2Th=&aW4Cy4khC+el5
zj!O^+$_edO^*Df&7+;f{ewHW$uxP-rGT<NH$>U@@gH1J);kfoj&2)hCc&0WjlY3Q8
za=6GZn_5>ZD}AamhBj`dG;zZKc4XR&$7p#CC)ACn)E3rlYrDWr9ULxmsN%p~D0U8)
z2;6MI*y&rbrbXd-4a;XhYG_`)s<TB=|K^$!h#{~TCej>>z!=wNfdr;p#mZ%WjESWQ
z4p?=LmFyymAznPh(2GI2fxh}W_yG^qPqd|Q-q0vnAc>gDP5h_6ldPS~C)vi{x5j~!
z>ZjbsgUcHw-U7El`3}c6Ot3w1pJX8lk;2&6@Lt|8L{iE*6msBqlwJ;c@vhR!ZB%Oc
z!4VF+<a2y=hL;a38bz3diyKeH-itOw#eQd!aS721u*}zQzrim={8IyT)^)uB)nuEi
zl{HBK-(Y|9XyZ{jsKG#U{R8_t9BeL4*Hhwd+|rPT&D`&UDb>i?DT}$%c(MpoZV4RB
zK}F?{GKjn6_n&>7;z91{0kH#OSCdb<FL{6k9(jk<&>bK4wyd?D=eJu4sM@-+-!P@s
z0ng#|)^zw4Yg-q>Pxxu;Zt7Qse`E3e8tYTaCs^TQs3)N4wYtf-w>gA4Eat$=sqku%
bj-<A!FbC(iwMVB*DfA>tq7;RFZQ1_<(>ENS

delta 2153
zcmah~eN0nV6o2RS>$Q{$E!YBOe5lYe1pLGg1Omu51rr6Vpn#PJ#mtX*d1EANbxEDZ
zY2x(6Xq+>!xnv31CVQKIm^o3RS*Dw!b90RvR2DxlB#X&1lez8OS2mPvSzq4Cx%ZrV
z&+q=u@4kL|6-EcaRu&s;5$JcsD6ENu`fPi|xB`EkBnU0-{!M|_4VwcC)U%?`0^8N(
z*lhqi)x)+?fNtCs_az*|%J@<ESe;|91NcJS?T7)mfCm!}!Bs3s+zyBExZ9~-OuPkf
z3wxb?a0eS*L-0^7PO1WUtnN;>0+{ho%07t49QRxBgL>RO0N_UDg`<#;j<j=-jgaL~
zAEhM$<e@R+36$;6+yP5)XXaK&RE<*(1Jq*A)FZG8i>IB1W)-rE0NSuP`*(N)7kYL=
z7zaGtpc>1){jfvT=UmpqZoHQF5QfzL{1Op{KbtuhAXY7$wN(en>WR4_5ejkk{1S_S
zh$*MHV=9K`U(YR21lgcKPzZx8hIJJ}qdTMv3PD|x5Hcwy*&H-D1zB=Z91s^g^wf)d
zEvHwMKrh-s0=pPT-eib_Jh4FJo&*WlyD+8jD@qFpAzjx@MTiy&1C_`O>4Um%QPFkl
zsgyoR=mE_admx2;z)3}=<+;x-anlklH6#%#L(oX5=p|IbmN$KZA_YxB2#X=JVjlA>
zK_eb3sssy;6nSt;Ng_^P<iuqq-gGOW>g308X~*D)$P{hh89PoC`i<wILztck(Ba>p
z|GB8?#s7vb$&v=$JO=$J9xlE;@9l|TTu}5k7|{Y2v4s+}AJ;VrIoiRKc)EmnauuUu
z;{DU`xkE<c$*6Ttk}W|!@e~v7-m9hipj&-fDni;(UNC|0C`$UQ@nXP>vAx*4Dk(mW
zqKeQBK@vxg7!rfHq|6<!V_h^KF)4l)XjMAc8a$Kc*k+@-<9ts&If7^%2h8PWq*s$%
z6*)45M0#~yM3M|73c@|6JQwv?<22f7mmupLB%UqF)ZeIBbkTe+k}%W=Ui~u0Pl11w
zWyKmaWNaUe2~}=+X6y-$Nc$3qdQj`j-2naAS+N(csK&)+J=|2|UNMO<U3D!5fJ!yF
zif-8o^i_K-e3b?{Pu*4huFf7X$T6~Ao*|dZ737=b#kgd7{+vpupd<#3L30xEPfSP0
zrU_$-k7c@1(H#6_d6M~SpCAi#f|u0G%YTI!6V-d*;Ls1?&o!gajNjKbKn~{Dwa1^L
z>GyPW6fOb@*eUg+x>|rfe7f==oW=vbrS$2#?NgoSDE>K5<O&f$q-$scc24bGH4WfA
z4%W}exIlpj)I@X}I|3}722qp2y#X>OaZ1B17*Kr;^8ha4JFC;C@?F_^ZmyDv7~3|p
zjedot(!eXSbv$s5i@<P(+(8^!oegKuvF70PD?GG?o9o=va>KV^PHuiA;}s)@PXC72
zTG<8srP<+;np-w+>TG4oeSV6lKCRTd1ki&>pBo$LGeKlG(cbtt^*5elr(FcPzk0eZ
zR?3S5D;R;@#muJF5W%fY`3@s#GRg>DB^PC~VeD_}q-bIDOoweeYJ+rQjNQXv^ID0M
z?$xnxakx3hF?l@6LMfE=05jHpuwaOi7#B4w=7z6f`?=BRx=Ehbz#90(X>K_A>^pA0
z(Fm&}Hx(!QFUF2li>6{mw#%@RVji@v8+6{~3;x-kDA%&?Xgl~QHe0o}NRZAywOTj4
z!1i!Iog1yO{p3~PY`O9Ok}9!JemO$}&kK5`Xf18KXTc}8=BAW#PWU&1{|`vu7TrWY
zf7l56TR*HGqR2#UM)=$_v_$k>>-=n-oQT-b5yhR(Gd1w_<W*r!+w1mAe6EcQ^+n_0
z5#DHX!%BS8mI3!MC9s12kv9e2r_RQ=?<gDZhNfVyZpJ050bm-d!+dy;n+M$RelSiv
e<Gj*2erlfs6*y`A`j}KHfgZbLlq?utpZgaB3H_D;

diff --git a/data analysis/analysis.py b/data analysis/analysis.py
index 56f29a37..399462a6 100644
--- a/data analysis/analysis.py	
+++ b/data analysis/analysis.py	
@@ -7,10 +7,12 @@
 #number of easter eggs: 2
 #setup:
 
-__version__ = "1.0.7.001"
+__version__ = "1.0.7.002"
 
 #changelog should be viewed using print(analysis.__changelog__)
 __changelog__ = """changelog:
+1.0.7.002:
+	- bug fixes
 1.0.7.001:
 	- bug fixes
 1.0.7.000:
@@ -622,7 +624,11 @@ def poly_regression(x, y, power):
 
     for i in range(0, len(x), 1):
         z = x[i]
-        exec("vals.append(" + eq_str + ")")
+
+        try:
+        	exec("vals.append(" + eq_str + ")")
+        except:
+        	pass
 
     _rms = rms(vals, y)
     r2_d2 = r_squared(vals, y) 
@@ -631,43 +637,57 @@ def poly_regression(x, y, power):
 
 def log_regression(x, y, base):
 
-    x_fit = []
+	x_fit = []
+	
+	for i in range(len(x)):
+		try:
+			x_fit.append(np.log(x[i]) / np.log(base)) #change of base for logs
+		except:
+			pass
 
-    for i in range(len(x)):
-        x_fit.append(np.log(x[i]) / np.log(base)) #change of base for logs
+	reg_eq = np.polyfit(x_fit, y, 1) # y = reg_eq[0] * log(x, base) + reg_eq[1]
+	q_str = str(reg_eq[0]) + "* (np.log(z) / np.log(" + str(base) +"))+" + str(reg_eq[1])
+	vals = []
 
-    reg_eq = np.polyfit(x_fit, y, 1) # y = reg_eq[0] * log(x, base) + reg_eq[1]
-    eq_str = str(reg_eq[0]) + "* (np.log(z) / np.log(" + str(base) +"))+" + str(reg_eq[1])
-    vals = []
+	for i in range(len(x)):
+		z = x[i]
 
-    for i in range(len(x)):
-        z = x[i]
-        exec("vals.append(" + eq_str + ")")
+		try:
+			exec("vals.append(" + eq_str + ")")
+		except:
+			pass
 
-    _rms = rms(vals, y)
-    r2_d2 = r_squared(vals, y)
+	_rms = rms(vals, y)
+	r2_d2 = r_squared(vals, y)
 
-    return eq_str, _rms, r2_d2
+	return eq_str, _rms, r2_d2
 
 def exp_regression(x, y, base):
 
-    y_fit = []
+	y_fit = []
 
-    for i in range(len(y)):       
-        y_fit.append(np.log(y[i]) / np.log(base)) #change of base for logs
+	for i in range(len(y)):
+		try:       
+			y_fit.append(np.log(y[i]) / np.log(base)) #change of base for logs
+		except:
+			pass
 
-    reg_eq = np.polyfit(x, y_fit, 1, w=np.sqrt(y_fit)) # y = base ^ (reg_eq[0] * x) * base ^ (reg_eq[1])
-    eq_str = "(" + str(base) + "**(" + str(reg_eq[0]) + "*z))*(" + str(base) + "**(" + str(reg_eq[1]) + "))"
-    vals = []
+	reg_eq = np.polyfit(x, y_fit, 1, w=np.sqrt(y_fit)) # y = base ^ (reg_eq[0] * x) * base ^ (reg_eq[1])
+	eq_str = "(" + str(base) + "**(" + str(reg_eq[0]) + "*z))*(" + str(base) + "**(" + str(reg_eq[1]) + "))"
+	vals = []
 
-    for i in range(len(x)):
-        z = x[i]
-        exec("vals.append(" + eq_str + ")")
+	for i in range(len(x)):
+		z = x[i]
 
-    _rms = rms(vals, y)
-    r2_d2 = r_squared(vals, y)
+		try:
+			exec("vals.append(" + eq_str + ")")
+		except:
+			pass
 
-    return eq_str, _rms, r2_d2
+	_rms = rms(vals, y)
+	r2_d2 = r_squared(vals, y)
+
+	return eq_str, _rms, r2_d2
 
 def tanh_regression(x, y):
 
@@ -681,7 +701,11 @@ def tanh_regression(x, y):
 
 	for i in range(len(x)):
 		z = x[i]
-		exec("vals.append(" + eq_str + ")")
+		try:
+			exec("vals.append(" + eq_str + ")")
+		except:
+			pass
+
 	_rms = rms(vals, y)
 	r2_d2 = r_squared(vals, y)
 
@@ -785,8 +809,6 @@ def optimize_regression(x, y, _range, resolution):#_range in poly regression is
     eqs.append(x)
     rmss.append(y)
     r2s.append(z)
-
-    print (eqs[::-1])
     
     for i in range (0, len(eqs), 1): #marks all equations where r2 = 1 as they 95% of the time overfit the data
         if r2s[i] == 1:
@@ -914,7 +936,7 @@ def debug():
     print(log_regression([1, 2, 3, 4], [2, 4, 8, 16], 2.717))
     print(exp_regression([1, 2, 3, 4], [2, 4, 8, 16], 2.717))
 
-    x, y, z, o = optimize_regression([0, 1, 2, 3, 4], [1, 2, 4, 7, 19], 10, 100)
+    x, y, z, o = optimize_regression([0, 1, 2, 3, 4, 5, 6, 7, 8, 9], [1, 2, 4, 7, 19, 22, 30, 50, 60, 80], 10, 10)
 
     for i in range(0, len(x), 1):
         print(str(x[i]) + " | " + str(y[i]) + " | " + str(z[i]) + " | " + str(o[i][0]) + " | " + str(o[i][1]))