From 4223a7fbe863df300861a8c1d3d71cc048e1f26d Mon Sep 17 00:00:00 2001 From: Zak Date: Wed, 10 Feb 2021 20:10:27 +0100 Subject: [PATCH 1/3] Fix the EOL Error --- generate_data.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/generate_data.py b/generate_data.py index ddd5020..d28dfd3 100644 --- a/generate_data.py +++ b/generate_data.py @@ -3,7 +3,12 @@ # Fixing random state for reproducibility np.random.seed(19680801) +<<<<<<< HEAD mu, sigma = 100, 15 x_gaussian = mu + sigma * np.random.randn(10000) +======= +mu, sigma = 100, 5 +x = mu + sigma * (np.random.randn(10,10000) ** 2).sum(0) +>>>>>>> 47fb5f2 (Data generation is no longer Gaussian!) np.savetxt('file_data.csv', x_gaussian, delimiter=',') From e38f248b8d3c67dea95c29635a169a7c1cd2b993 Mon Sep 17 00:00:00 2001 From: Zak Date: Wed, 10 Feb 2021 20:16:52 +0100 Subject: [PATCH 2/3] Fix the EOL Error --- plot.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/plot.py b/plot.py index 8f62462..b74a879 100644 --- a/plot.py +++ b/plot.py @@ -5,7 +5,7 @@ x = np.loadtxt('file_data.csv') # the histogram of the data -n, bins, patches = plt.hist(x, 50, density=True, facecolor='r, alpha=0.74) +n, bins, patches = plt.hist(x, 50, density=True, facecolor='r', alpha=0.74) plt.xlabel('Smarts') plt.ylabel('Probability') From cacd4534a56907e51cf2faf3d66ff535d5f9b0bd Mon Sep 17 00:00:00 2001 From: Zak Date: Wed, 10 Feb 2021 20:34:12 +0100 Subject: [PATCH 3/3] change variable name in generate_data --- generate_data.py | 5 ----- 1 file changed, 5 deletions(-) diff --git a/generate_data.py b/generate_data.py index d28dfd3..ddd5020 100644 --- a/generate_data.py +++ b/generate_data.py @@ -3,12 +3,7 @@ # Fixing random state for reproducibility np.random.seed(19680801) -<<<<<<< HEAD mu, sigma = 100, 15 x_gaussian = mu + sigma * np.random.randn(10000) -======= -mu, sigma = 100, 5 -x = mu + sigma * (np.random.randn(10,10000) ** 2).sum(0) ->>>>>>> 47fb5f2 (Data generation is no longer Gaussian!) np.savetxt('file_data.csv', x_gaussian, delimiter=',')