Faster simulaiton

EdvinGermer · May 15, 2023 · 7f532e2 · 7f532e2
1 parent 87397ae
commit 7f532e2
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 22 deletions.
diff --git a/Project/histogram.png b/Project/histogram.png
diff --git a/Project/histogram.txt b/Project/histogram.txt
@@ -1,2 +1,2 @@
-458, 479, 500, 521, 542, 563, 584, 605, 626, 647, 668, 689, 710, 731, 752, 773, 794, 815, 836, 857, 895
-15, 110, 307, 700, 1181, 1540, 1518, 1308, 1044, 806, 503, 343, 237, 171, 96, 57, 27, 21, 9, 4
+416, 447, 478, 509, 540, 571, 602, 633, 664, 695, 726, 757, 788, 819, 850, 881, 912, 943, 974, 1005, 1036
+37, 1446, 18420, 84897, 182233, 226089, 193834, 133062, 78835, 43027, 21758, 9801, 4113, 1610, 583, 189, 40, 20, 4, 1
diff --git a/Project/montecarlo b/Project/montecarlo
diff --git a/Project/montecarlo.c b/Project/montecarlo.c
@@ -50,10 +50,12 @@ int main(int argc, char *argv[])
         return -1;
     }
 
+
     /* HOW MANY EXPERIMENTS PER PROCESS */
     N = atoi(argv[1]); // Total number of experiments
     n = N/size;           // Experiments per process
 
+
     /* DEFINE MATRIX P */
     int P[15][7] = {
     {1, 0, 0, 0, 0, 0, 0},
@@ -73,20 +75,24 @@ int main(int argc, char *argv[])
     {0, 0, 0, 0, 0, 0, -1}
     };
 
+
     /* START LOCAL TIME */
     double start = MPI_Wtime();
 
+
     /* MONTE CARLO SIMULATION */
-    int **X = calloc(7, sizeof(int*));
+    int **X = calloc(7, sizeof(int*)); // Big result matrix
     for (int i=0; i<7; i++)
         X[i] = calloc(n, sizeof(int));
-
-
-    srand(time(NULL)+rank); // Random seed for each rank
+
+    int x[7]; // Initial state vector
+
+    srand(time(NULL)+rank);// Random seed for each rank
 
     for (int i=0;i<n;i++)  
     {
-        int x[7] = {900,900,30,330,50,270,20};  // Initial state vector
+        // Initialize
+        x[0]=900; x[1]=900; x[2]=30; x[3]=330; x[4]=50; x[5]=270; x[6]=20;
 
         // Do experiment (simulation)
         t=0;
@@ -132,13 +138,6 @@ int main(int argc, char *argv[])
             X[row][i] = x[row];   // save x as a column in X
     }
 
-    /* SANITY CHECK */
-    /* printf("Rank %d: \n", rank);
-    for (int i=0;i<n;i++)
-        printf("%d, ", X[0][i]);
-    printf("\n"); */
-
-
     /* EXTRACT SUSCEPTIBLE HUMANS */
     int* local_res = (int*)malloc(n * sizeof(int));
 
@@ -165,12 +164,6 @@ int main(int argc, char *argv[])
 
     MPI_Allreduce(&local_max, &global_max, 1, MPI_INT, MPI_MAX, MPI_COMM_WORLD);
     MPI_Allreduce(&local_min, &global_min, 1, MPI_INT, MPI_MIN, MPI_COMM_WORLD);
-
-
-    /* SANITY CHECK */
-    //printf("RANK %d:  local_max = %d, local_min = %d\n",rank, local_max, local_min);
-    //if (rank==0)
-    //    printf("RANK %d:  global_max = %d, global_min = %d\n",rank, global_max, global_min);
 
 
     /* LOCAL HISTOGRAM */
@@ -180,7 +173,6 @@ int main(int argc, char *argv[])
     for (int i=0;i<b;i++)
         bins[i] = global_min + i*interval;
     bins[b] = global_max;
-
 
     int freqs[20] = {0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0,0}; // count each bin
     int bin;

diff --git a/Project/plot_histogram.py → Project/plot.py b/Project/plot_histogram.py → Project/plot.py
@@ -16,7 +16,7 @@
 plt.bar(mid_points, counts, width=np.diff(boundaries), align='center', edgecolor='black')
 
 # Add labels and title
-plt.xlabel('Boundaries')
+plt.xlabel('Susceptible humans')
 plt.ylabel('Counts')
 plt.title('MC Simulation of Malara Epidemic')