bug fix and update

theLongLab · Sep 18, 2024 · 8036c9b · 8036c9b
1 parent 514ca7f
commit 8036c9b
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 5 deletions.
diff --git a/cancer.cu b/cancer.cu
@@ -262,7 +262,8 @@ void cancer::ingress()
                               tissues_ATGC_positions_Mutation_rate_factor,
                               tissues_ATGC_positions_Generation_death,
                               tissues_ATGC_positions_Replication_prob,
-                              tissues_ATGC_positions_Metastatic);
+                              tissues_ATGC_positions_Metastatic,
+                              profile_tissue_Limits);
 
     if (stop == 1)
     {

diff --git a/cancer_Host.cu b/cancer_Host.cu
@@ -64,7 +64,8 @@ void cancer_Host::simulate_Generations(functions_library &functions,
                                        float **tissues_ATGC_positions_Mutation_rate_factor,
                                        float **tissues_ATGC_positions_Generation_death,
                                        float **tissues_ATGC_positions_Replication_prob,
-                                       float **tissues_ATGC_positions_Metastatic)
+                                       float **tissues_ATGC_positions_Metastatic,
+                                       int *profile_tissue_Limits)
 {
     cout << "\nSTEP 6: Conducting simulation\n";
 
@@ -282,6 +283,12 @@ void cancer_Host::simulate_Generations(functions_library &functions,
                             }
                         }
 
+                        if (profile_tissue_Limits[tissue] != -1 && parent_population_Count > profile_tissue_Limits[tissue])
+                        {
+                            cout << "\nMax cell count in tissue reached\n";
+                            parent_population_Count = profile_tissue_Limits[tissue];
+                        }
+
                         check_to_Remove.clear();
                         removed_by_Transfer_Indexes[tissue].clear();
                         dead_Particle_count[tissue] = 0;
@@ -727,10 +734,15 @@ void cancer_Host::calculate_Tajima(functions_library &functions,
 
         for (double n = 1; n < N; n++)
         {
-            a_1 = a_1 + ((double)1.0 / n);
-            a_2 = a_2 + ((double)1.0 / (n * n));
+            a_1 = a_1 + (1.0 / n);
+            a_2 = a_2 + (1.0 / (n * n));
         }
         cout << "a1: " << a_1 << endl;
+        if (isinf(a_2))
+        {
+            // pi_squared /6
+            a_2 = 1.64493128;
+        }
         cout << "a2: " << a_2 << endl;
 
         b1 = (N_float + 1.0) / (3.0 * (N_float - 1.0));

diff --git a/cancer_Host.cuh b/cancer_Host.cuh
@@ -206,7 +206,8 @@ public:
                              float **tissues_ATGC_positions_Generation_death,
                              float **tissues_ATGC_positions_Replication_prob,
                              float **tissues_ATGC_positions_Metastatic,
-                             string &viral_Migration);
+                             string &viral_Migration,
+                             int *profile_tissue_Limits);
 
     // void replication_Generation_thread(int gpu, cudaStream_t *streams,
     //                                    char *cuda_full_Char, char *full_Char,