From c35ddcc358ddc727c4cdfbc6a27bf9a40bd3ff1e Mon Sep 17 00:00:00 2001
From: NunoSempere <nuno.sempere@protonmail.com>
Date: Mon, 29 May 2023 19:04:21 -0400
Subject: [PATCH] C-optimized tweaks.

---
 C-optimized/makefile    |   2 +-
 C-optimized/out/samples | Bin 22608 -> 22608 bytes
 C-optimized/samples.c   |  48 +++++++++++++++++++++-------------------
 3 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/C-optimized/makefile b/C-optimized/makefile
index 8176d59f..83174017 100644
--- a/C-optimized/makefile
+++ b/C-optimized/makefile
@@ -37,7 +37,7 @@ format: $(SRC)
 	$(FORMATTER) $(SRC)
 
 run: $(SRC) $(OUTPUT)
-	export OMP_NUM_THREADS=4; ./$(OUTPUT)
+	OMP_NUM_THREADS=4 ./$(OUTPUT)
 
 test: $(SRC) $(OUTPUT)
 	OMP_NUM_THREADS=1 ./$(OUTPUT)
diff --git a/C-optimized/out/samples b/C-optimized/out/samples
index c2099b0793b2511c82c14b47a6f533b594f78413..015ac6ccbd2ada9d77136240693b8d9a54f74410 100755
GIT binary patch
delta 2623
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
X@89!!S~sPKDr1aQ91V}PzO4EW5US76

delta 2627
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

diff --git a/C-optimized/samples.c b/C-optimized/samples.c
index ac353496..744b00ab 100644
--- a/C-optimized/samples.c
+++ b/C-optimized/samples.c
@@ -242,35 +242,37 @@ float split_array_sum(float** meta_array, int length, int divided_into)
 
 int main()
 {
-    clock_t start, end;
-    start = clock();
     //initialize randomness
     srand(time(NULL));
-    // Toy example
-    // Declare variables in play
-    float p_a, p_b, p_c;
-    int n_threads = omp_get_max_threads();
-    // printf("Max threads: %d\n", n_threads);
-    // omp_set_num_threads(n_threads);
-    float** dist_mixture = malloc(n_threads * sizeof(float*));
-    split_array_allocate(dist_mixture, N, n_threads);
+    
+		clock_t start, end;
+		start = clock();
 
-    // Initialize variables
-    p_a = 0.8;
-    p_b = 0.5;
-    p_c = p_a * p_b;
+		// Toy example
+		// Declare variables in play
+		float p_a, p_b, p_c;
+		int n_threads = omp_get_max_threads();
+		// printf("Max threads: %d\n", n_threads);
+		// omp_set_num_threads(n_threads);
+		float** dist_mixture = malloc(n_threads * sizeof(float*));
+		split_array_allocate(dist_mixture, N, n_threads);
 
-    // Generate mixture
-    int n_dists = 4;
-    float weights[] = { 1 - p_c, p_c / 2, p_c / 4, p_c / 4 };
-    float (*samplers[])(void) = { sample_0, sample_1, sample_few, sample_many };
+		// Initialize variables
+		p_a = 0.8;
+		p_b = 0.5;
+		p_c = p_a * p_b;
 
-    mixture_f(samplers, weights, n_dists, dist_mixture, n_threads);
-    printf("Sum(dist_mixture, N)/N = %f\n", split_array_sum(dist_mixture, N, n_threads) / N);
+		// Generate mixture
+		int n_dists = 4;
+		float weights[] = { 1 - p_c, p_c / 2, p_c / 4, p_c / 4 };
+		float (*samplers[])(void) = { sample_0, sample_1, sample_few, sample_many };
 
-    end = clock();
-    split_array_free(dist_mixture, n_threads);
+		mixture_f(samplers, weights, n_dists, dist_mixture, n_threads);
+		printf("Sum(dist_mixture, N)/N = %f\n", split_array_sum(dist_mixture, N, n_threads) / N);
 
-    printf("Total time (ms): %f\n", ((double)(end - start)) / CLOCKS_PER_SEC * 1000);
+		split_array_free(dist_mixture, n_threads);
+		
+		end = clock();
+		printf("Time (ms): %f\n", ((double)(end - start)) / (CLOCKS_PER_SEC * 10) * 1000);
     return 0;
 }