updated stuff

This commit is contained in:
ltcptgeneral 2018-11-29 09:27:08 -06:00
parent f94bf31247
commit b25983f97c
4 changed files with 9 additions and 3 deletions

View File

@ -678,7 +678,7 @@ def tanh_regression(x, y):
for i in range(len(x)): for i in range(len(x)):
z = x[i] z = x[i]
exec("vals.append(" + eq_str + ")") exec("vals.append(" + eq_str + ")") in globals(), locals()
_rms = rms(vals, y) _rms = rms(vals, y)
r2_d2 = r_squared(vals, y) r2_d2 = r_squared(vals, y)
@ -838,11 +838,11 @@ def basic_analysis(filepath): #assumes that rows are the independent variable an
def benchmark(x, y): def benchmark(x, y):
start_g = time.time() start_g = time.time()
generate_data("benchmark_data.csv", x, y, -10, 10) generate_data("data.csv", x, y, -10, 10)
end_g = time.time() end_g = time.time()
start_a = time.time() start_a = time.time()
basic_analysis("benchmark_data.csv") basic_analysis("data.csv")
end_a = time.time() end_a = time.time()
return [(end_g - start_g), (end_a - start_a)] return [(end_g - start_g), (end_a - start_a)]

BIN
data analysis/analysis.pyc Normal file

Binary file not shown.

View File

@ -0,0 +1,6 @@
matplotlib==3.0.2
numpy==1.15.4
scipy==1.1.0
sklearn==0.0
torch==0.4.1
torchvision==0.2.1