diff --git a/data analysis/__pycache__/analysis.cpython-37.pyc b/data analysis/__pycache__/analysis.cpython-37.pyc index f9b64cbd..f39e6ff5 100644 Binary files a/data analysis/__pycache__/analysis.cpython-37.pyc and b/data analysis/__pycache__/analysis.cpython-37.pyc differ diff --git a/data analysis/analysis.py b/data analysis/analysis.py index 55a56355..73b67c50 100644 --- a/data analysis/analysis.py +++ b/data analysis/analysis.py @@ -678,7 +678,7 @@ def tanh_regression(x, y): for i in range(len(x)): z = x[i] - exec("vals.append(" + eq_str + ")") + exec("vals.append(" + eq_str + ")") in globals(), locals() _rms = rms(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): 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() start_a = time.time() - basic_analysis("benchmark_data.csv") + basic_analysis("data.csv") end_a = time.time() return [(end_g - start_g), (end_a - start_a)] diff --git a/data analysis/analysis.pyc b/data analysis/analysis.pyc new file mode 100644 index 00000000..07f9f3c5 Binary files /dev/null and b/data analysis/analysis.pyc differ diff --git a/data analysis/requirements.txt b/data analysis/requirements.txt new file mode 100644 index 00000000..9fd4fd1a --- /dev/null +++ b/data analysis/requirements.txt @@ -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 \ No newline at end of file