piegy 2.3.3__tar.gz → 2.3.4__tar.gz

{piegy-2.3.3/src/piegy.egg-info → piegy-2.3.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: piegy
-Version: 2.3.3
+Version: 2.3.4
 Summary: Payoff-Driven Stochastic Spatial Model for Evolutionary Game Theory
 Author-email: Chenning Xu <cxu7@caltech.edu>
 License: BSD 3-Clause License

{piegy-2.3.3 → piegy-2.3.4}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = 'setuptools.build_meta'
 
 [project]
 name = 'piegy'
-version = '2.3.3'
+version = '2.3.4'
 description = 'Payoff-Driven Stochastic Spatial Model for Evolutionary Game Theory'
 readme = 'README.md'
 requires-python = '>=3.7'

{piegy-2.3.3 → piegy-2.3.4}/src/piegy/C_core/sim_funcs.h

@@ -36,7 +36,7 @@
 #define SMALL_MAXTIME 2
 #define SIM_OVERFLOW 3
 
-// where 1 + exp(x) is considered overflow
+// where exp(x) is considered overflow
 // below the actual bound (709) because the large numbers will be computed with close-to-0 ones (payoff rates), so higher accuracy is needed
 #define EXP_OVERFLOW_BOUND 500
 
@@ -116,19 +116,19 @@ static inline void update_pi_k(patch_t* restrict p, const double* restrict M_sta
 
     double U = (double) p->U;
     double V = (double) p->V;
-    double sum = U + V - 1;
-    //double U_ratio = U / sum;
-    //double V_ratio = V / sum;
+    double sum = U + V;
+    double U_ratio = U / sum;
+    double V_ratio = V / sum;
 
     if (sum > 0) {
         if (U > 0) {
-            p->U_pi = (U - 1) / sum * M_start[0] + V / sum * M_start[1];
+            p->U_pi = U_ratio * M_start[0] + V_ratio * M_start[1];
         } else {
             p->U_pi = 0.0;
         }
 
         if (V > 0) {
-            p->V_pi = U / sum * M_start[2] + (V - 1) / sum * M_start[3];
+            p->V_pi = U_ratio * M_start[2] + V_ratio * M_start[3];
         } else {
             p->V_pi = 0.0;
         }
@@ -141,8 +141,8 @@ static inline void update_pi_k(patch_t* restrict p, const double* restrict M_sta
     p->pi_death_rates[0] = fabs(U * p->U_pi);
     p->pi_death_rates[1] = fabs(V * p->V_pi);
 
-    p->pi_death_rates[2] = P_start[4] * U * (sum + 1);
-    p->pi_death_rates[3] = P_start[5] * V * (sum + 1);
+    p->pi_death_rates[2] = P_start[4] * U * sum;
+    p->pi_death_rates[3] = P_start[5] * V * sum;
 
     p->sum_pi_death_rates = 0.0;
     for (size_t i = 0; i < 4; i++) {
@@ -153,6 +153,7 @@ static inline void update_pi_k(patch_t* restrict p, const double* restrict M_sta
 
 
 static inline void update_mig_just_rate(patch_t* restrict p, const double* restrict P_start) {
+    // BUGGY - not using
     // update migration weight for patch p, in location loc. Only rate is updated
     // used by last-changed patch, when there is only one last-changed patch
     double* p_U_weight = p->U_weight;
@@ -195,20 +196,20 @@ static inline uint8_t update_mig_weight_rate(patch_t* restrict p, const double*
 
     switch(loc) {
         case MIG_UP:
-            p_U_weight[MIG_UP] = 1 + exp(w1_Upi);
-            p_V_weight[MIG_UP] = 1 + exp(w2_Vpi);
+            p_U_weight[MIG_UP] = exp(w1_Upi);
+            p_V_weight[MIG_UP] = exp(w2_Vpi);
             break;
         case MIG_DOWN:
-            p_U_weight[MIG_DOWN] = 1 + exp(w1_Upi);
-            p_V_weight[MIG_DOWN] = 1 + exp(w2_Vpi);
+            p_U_weight[MIG_DOWN] = exp(w1_Upi);
+            p_V_weight[MIG_DOWN] = exp(w2_Vpi);
             break;
         case MIG_LEFT:
-            p_U_weight[MIG_LEFT] = 1 + exp(w1_Upi);
-            p_V_weight[MIG_LEFT] = 1 + exp(w2_Vpi);
+            p_U_weight[MIG_LEFT] = exp(w1_Upi);
+            p_V_weight[MIG_LEFT] = exp(w2_Vpi);
             break;
         default:
-            p_U_weight[MIG_RIGHT] = 1 + exp(w1_Upi);
-            p_V_weight[MIG_RIGHT] = 1 + exp(w2_Vpi);
+            p_U_weight[MIG_RIGHT] = exp(w1_Upi);
+            p_V_weight[MIG_RIGHT] = exp(w2_Vpi);
             break;
     }
     p->sum_U_weight += p_U_weight[loc];
@@ -255,8 +256,8 @@ static inline uint8_t init_mig(patch_t* restrict p, const double* restrict P_sta
             if (w2_Vpi > EXP_OVERFLOW_BOUND) {
                 return SIM_OVERFLOW;
             }
-            p_U_weight[i] = 1 + exp(w1_Upi);
-            p_V_weight[i] = 1 + exp(w2_Vpi);
+            p_U_weight[i] = exp(w1_Upi);
+            p_V_weight[i] = exp(w2_Vpi);
 
             p->sum_U_weight += p_U_weight[i];
             p->sum_V_weight += p_V_weight[i];

{piegy-2.3.3 → piegy-2.3.4}/src/piegy/__version__.py

@@ -1,4 +1,4 @@
-__version__ = '2.3.3'
+__version__ = '2.3.4'
 
 '''
 version history:
@@ -40,4 +40,5 @@ version history:
 2.3.2: allow play-with-self in payoff calculation. Changed migration function to e^(w*pi) (removed "1+" term).
         Simplified update-migration functions, improve speed by ~10%. Add -march=native flag to Makefile.
 2.3.3: fix error in calculation of migration rates.
+2.3.4: change back to the mig & payoff rules in version 2.3.2
 '''

{piegy-2.3.3 → piegy-2.3.4/src/piegy.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: piegy
-Version: 2.3.3
+Version: 2.3.4
 Summary: Payoff-Driven Stochastic Spatial Model for Evolutionary Game Theory
 Author-email: Chenning Xu <cxu7@caltech.edu>
 License: BSD 3-Clause License