From 07a381b01b1a9d2103599cc7b53dfe90e5728abf Mon Sep 17 00:00:00 2001
From: ltcptgeneral <35508619+ltcptgeneral@users.noreply.github.com>
Date: Tue, 27 Nov 2018 18:08:39 -0600
Subject: [PATCH] 6

---
 .../__pycache__/analysis.cpython-37.pyc       | Bin 22921 -> 23794 bytes
 data analysis/analysis.py                     |  62 +++++++++++++++++-
 2 files changed, 60 insertions(+), 2 deletions(-)

diff --git a/data analysis/__pycache__/analysis.cpython-37.pyc b/data analysis/__pycache__/analysis.cpython-37.pyc
index 6cd5efbeb0eb07cc6c65475917e20d0f144b2783..c1b475c5fc788fc5f0c795a1697a15f294199c8e 100644
GIT binary patch
delta 2078
zcmaJ?U2GIp6rOWuc6Yk;2X;$;XuEE!mTZ91E+9|}RD`zlXA6|F+ZHHG?^v65ciTHd
zX~~i%wh~P+)ZUmFUsQ;M7l~wrgrGhc6JJaW@#kSRK5C2+1wue0spm}Bc0uAy?|1H=
z-|yaY@AS14+_?_<yYlkf3O*ZWANF;QzL8%7!7Hl;?5UYide`#xycXp;UdKHsYj}`v
zK)If8<eN~|^5^(wly%Jt-@>=fD1582YFh0L@*ZB#x6Oe35!Q4!@n-bd%3Jtel=Zxq
zxAFEF=-tLUcnCEOyp!)kxt;Il2T<<deY}ewM30^PFz@DvaMs9=@Gy_y?0LSjO9>oJ
zg;<pfHp#J^@;n~3qW)++Ix=YvnW?imduu>VeYg1s7G<<Dd`QxG0f*^BNCJmpCUlex
zr6;ai3RkD$W#9^?*FtG6%A>KgYK$AF+_3~V{Du$-5dcww;Q=Q4QHaBGtg~>+w8YS8
zKe2cli<mlE6sBuBW16^#^8t-C_>d(BhfU)xP!vl^Vo?i*RZ(a$4n$y3Ij!Mv;BZd#
zS}JEr#?@k?r|wpcG@W)OwRbhkk;FwLUDGO`Vx`J^07}yFh+55PosVd>1?^ZctW2E2
z<SKV0)j~{OtV}aZKYH3VdDJf8qym;J=}M|)$~0i1>^fQ2sf;<hV3s*!%@htRW3!;p
z+k>+R4kYsG6NrdKBKrRl(UVh;^UNml-{3_e@!Wrj#92g{g|U*blGKupq;pWkGvExJ
zDiVg77&&1LCF1_r3Dfc)H~d3!ORT^iitPju1mhQu7|2O$*5s%mCP`0+MC>HkOt6d~
zkD!Mj7a^dFb2OhtNIUyQG(Kpg-Ae`W=#80aO~gzyt%{&2VMSqA+M5`)hGIjfjDBGZ
zqO*zAF43W@#WV`bWjfRBw}=%%5v*b*j4>bhpo%$}`;lL{OkBp8)Rp?z0lrD?Y*+@R
zw<uM<ol1x0pfertW#UF^VEfZhaSbhhExEXv2Wu6va#jf9TI#}%+bVpNdUIEdu^d%u
zdp=%q3j=nmm=l8(9mK8F%{>PIBJ!E$CWp9$N;%rx?!1i?@rV4Zxe1zOPD`rzJ}UYs
z&b~{)kVQU-`>C&6o&|Uy|J+*#^KwmVnd2ThMrB*;2Dm4uTIb=CoNC*`G?3TZd<~RE
zJRs2VuBDwXCPXZ1iBi<y1-5tJjRsLpE;dxq>@LED^tP{tyK-CmT##rA7dhIk&7+y!
zM#?G*$%-clQ>Go`(UB8|n8&Yz*RA&tB;w<Su+GWyjtcO|`i{Hsj;sllL8)vF^+AEW
z7+UB3U~!qu4JDv~D3d>h#`6m(r6yLPNW+M{9I7l9mN9m9$vq$ZxG%yd&vzcnp`8w>
z0zfX?7w~?v<mILgf~b_u`!3Y4B*vY@xRHQ@#CZaHmpoL`vG8THTQW~3MlpZON{`pk
zi@!gY4g0^$%apS}g16;|p<<`#L*rL6c;M#xQi^D#Slcc0tt=+(V_SU~oxV>6yL9mV
zPX5%B0Hk3cs~vYx_p6K?JmSxC5mk%X?4FU+Z}QuNEtU348Yz#yuoBxddnG%%eFe6X
zBGYQWY5pvSyGx;3zS8}E-IKPcnu=xZPFkBd9u;C?k7VDWGCV0K51sUA<QJpb>O$?+
zbK!D$C@aF11y7+Z0HMs^F4+;@4PH4He#!SK28gr7#bpkU7*P=yS4mYxP#{YpJ;&(3
zh<#hda+=*Bpvx%e+Gn-VKJj!X>_co*7Irtvh?$R|l7Jd%H%w3mM78`PQVVnPL1aYD
L*VoE{p6Y)9(Kq1)

delta 1283
zcmZuwU2IfU5WaJE7w#_E?awZ@=-q~`A<c&VY>NoAS{7rWwB2sI+m`lj`KivL(H6*A
zZ6UsB=nDokIsqd*iGiSv3FP`hVgd<|YK;1JV~nx>5J*WtiG~O`bBk<4y!Ylib7#Jp
zIWu$4t&4EPfyi^=aLC~2&iDTmetzY>NG;S~XwcAAJ!{yF*o-Z_Hem`|d2PlvT*qt6
zHUpo+^|J=9FFt<QXQyx&pT-TdV7KB%+{BDFY{!mSgMNgyT_d;+yV<r0w_^|6+OZe=
zc<sOp_VfA-?!YV#FymPq#X-!m)QMx5$03$B<I22|w4Gh5emOMITS3d23wAdHIDc;V
zK{=7mqW~wJQ=3=7s?U{Slp<1$GNBSoMt+q(?_5eh3Gq2LTrN{Ws#^KgW6Dx7&~wiH
zEjNAeiF31SN~v!Y?dkraYMvcJK90#wh6#G!Y1*CxsG~P~wk~u1uN^v2q%V8=mi@+N
z{VT<Lw?de(*Qr@xMM4}+77S3ljR@!kr@3zpzzrJ8v?gw|!G*l*n<~AeE&f@AxJcI+
z8t80h9b6+fb04mg+rP2#j(CK#(?z{^a{o-1*88;^8kv}Uz39nWlIj}*_YCUH)~qt%
zzo=e(FZ5NmchbIW16-vO+4tM73;(XbApxJbjEQtlASR$#msD<GT2krT)Y=iHsevF2
z)675|OgcXB2NdbZ;1f_mX9f!pAjmaEOApIeA*cmE=qlQhn>GUy&95uzQf_VZjWQ_$
ztGP=$Mt5_2g7cg=>C=B1v^SrO9xk&&GEmSpbUOcW`wH1?R<@WH5GQ?Fz-xjji2{1J
zD7*nl$MxR=w<u8+4cIKcO&<(>6@HLzkxB=KEjUichQDp8kOXP*@EB?_SXi`=Ol+J<
zA34WHOsM-s`0p|#!G#x>O!arxT_9)2&ecmOy7pl-Z$3hDC^g!h@QO%F9CI<R$6Q*(
zhof~#Pbr?RZ+EHmnRKd>|KtLgU?~e?-m5M8Y4l9y|2k&L29`9-^&fm;LYG_Ss#59E
za(8iti}c;tOtl<JJ;lJ|^7<F2f^ESSI%p><R&wYh^gsC0bk2Srg0x`2T<3_}Q3iK;
z>D9^Ngx;q=6;-`JfJ%k25h+8T7m$0aQv&4?dxu@_iIx-X?O%K2s*-YI0yP3MWL*%D
U5pf$D$5ZeQ?Hr$^ugBN?3u96@{{R30

diff --git a/data analysis/analysis.py b/data analysis/analysis.py
index fb346164..3172c8a0 100644
--- a/data analysis/analysis.py	
+++ b/data analysis/analysis.py	
@@ -618,10 +618,10 @@ def exp_regression(x, y, base):
     y_fit = []
 
     for i in range(len(y)):
-
+        
         y_fit.append(np.log(y[i]) / np.log(base)) #change of base for logs
 
-    reg_eq = np.polyfit(x, y_fit, 1, w=np.sqrt(y)) # y = base ^ (reg_eq[0] * x) * base ^ (reg_eq[1])
+    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]) + "))"
 
@@ -663,6 +663,64 @@ def rms(predictions, targets): # assumes equal size inputs
 
     return float(out)
 
+def strip_data(data, mode):
+
+    if mode == "adam": #x is the row number, y are the data
+
+        pass
+
+    if mode == "eve": #x are the data, y is the column number
+
+        pass
+
+    else:
+
+        raise error("mode error")
+
+def optimize_regression(x, y, _range, resolution):#_range in poly regression is the range of powers tried, and in log/exp it is the inverse of the stepsize taken from -1000 to 1000
+
+    if type(resolution) != int:
+
+        raise error("resolution must be int")
+
+    eqs = []
+
+    rmss = []
+
+    r2s = []
+
+    for i in range (0, _range + 1, 1):
+
+        eqs.append(poly_regression(x, y, i)[0])
+        rmss.append(poly_regression(x, y, i)[1])
+        r2s.append(poly_regression(x, y, i)[2])
+
+    for i in range (1, 100 * resolution + 1):
+
+        try:
+        
+            eqs.append(exp_regression(x, y, float(i / resolution))[0])
+            rmss.append(exp_regression(x, y, float(i / resolution))[1])
+            r2s.append(exp_regression(x, y, float(i / resolution))[2])
+
+        except:
+
+            pass
+
+    for i in range (1, 100 * resolution + 1):
+
+        try:
+
+            eqs.append(log_regression(x, y, float(i / resolution))[0])
+            rmss.append(log_regression(x, y, float(i / resolution))[1])
+            r2s.append(log_regression(x, y, float(i / resolution))[2])
+
+        except:
+
+            pass
+
+    return [eqs, rmss, r2s]
+
 def basic_analysis(filepath): #assumes that rows are the independent variable and columns are the dependant. also assumes that time flows from lowest column to highest column.
     
     data = load_csv(filepath)