diff --git a/src/libaevol/7/Rna_7.cpp b/src/libaevol/7/Rna_7.cpp index a3bbd1f3ea7e05ae3043597e53cb6f40c6700bc4..ceb93d976649133a6796e1fbc0ddb88b0a68ee74 100644 --- a/src/libaevol/7/Rna_7.cpp +++ b/src/libaevol/7/Rna_7.cpp @@ -106,7 +106,6 @@ double Rna_7::affinity_with_protein( int32_t index, Protein_7 *protein, Individu } } - // printf("Quadon %d : %d / %d %d %d %d\n",index,pos,quadon[0],quadon[1],quadon[2],quadon[3]); quadon_tab[pos - index] = quadon[0] + quadon[1] + quadon[2] + quadon[3]; } @@ -123,9 +122,6 @@ double Rna_7::affinity_with_protein( int32_t index, Protein_7 *protein, Individu protein->codon_list[i + j]); } } - // if (temp > 0.0) - // printf("%d -- %d => %lf\n",indiv->indiv_id,index, - // temp); max = (max < temp) ? temp : max; } @@ -142,39 +138,14 @@ double Rna_7::compute_synthesis_rate() { double enhancer_activity = 0; double operator_activity = 0; -//for (auto affinity = affinity_list.begin(); affinity != affinity_list.end(); affinity++) { #pragma omp simd reduction(+:enhancer_activity,operator_activity) for (decltype(affinity_list.size()) i = 0; i < affinity_list.size(); i++) { enhancer_activity += affinity_list[i].enhancer_factor * affinity_list[i].concentration(); operator_activity += affinity_list[i].operator_factor * affinity_list[i].concentration(); - - // if (AeTime::time() == 85303) - // printf("%d -- %d -- RNA %d Protein %d (%lf) :: Enhancer %lf Operator %lf\n",AeTime::time(), - // #ifdef HAVE_MPI - // indiv->exp_m_->exp_m_7_->localXtoGlobalX(indiv->indiv_id / indiv->exp_m_->exp_m_7_->grid_height_)*indiv->exp_m_->exp_m_7_->global_grid_height_+indiv->exp_m_->exp_m_7_->localYtoGlobalY(indiv->indiv_id % indiv->exp_m_->exp_m_7_->grid_height_) - // indiv_id / grid_height_,indiv_id % grid_height_, - // localXtoGlobalX(indiv_id / grid_height_),localYtoGlobalY(indiv_id % grid_height_), - // #else - // indiv->indiv_id - // #endif - // ,begin,affinity.protein->protein_start, - // affinity.concentration(), affinity.enhancer_factor, affinity.operator_factor); } -// if (indiv->indiv_id==137) - // if (enhancer_activity !=0 || operator_activity != 0) - // printf("%d -- %d -- RNA %d Enhancer %lf Operator %lf\n",AeTime::time(), - // #ifdef HAVE_MPI - // indiv->exp_m_->exp_m_7_->localXtoGlobalX(indiv->indiv_id / indiv->exp_m_->exp_m_7_->grid_height_)*indiv->exp_m_->exp_m_7_->global_grid_height_+indiv->exp_m_->exp_m_7_->localYtoGlobalY(indiv->indiv_id % indiv->exp_m_->exp_m_7_->grid_height_) - // // indiv_id / grid_height_,indiv_id % grid_height_, - // // localXtoGlobalX(indiv_id / grid_height_),localYtoGlobalY(indiv_id % grid_height_), - // #else - // indiv->indiv_id - // #endif - // ,begin,enhancer_activity,operator_activity); - ProteinConcentration enhancer_activity_pow_n = enhancer_activity == 0 ? 0 @@ -186,28 +157,6 @@ double Rna_7::compute_synthesis_rate() { : pow(operator_activity, exp_manager->exp_s()->get_hill_shape_n()); - // if ((indiv->exp_m_->exp_s()->get_hill_shape() / - // (operator_activity_pow_n + indiv->exp_m_->exp_s()->get_hill_shape())) * - // (1 + ((1 / e) - 1) * (enhancer_activity_pow_n / - // (enhancer_activity_pow_n + - // indiv->exp_m_->exp_s()->get_hill_shape()))) != 1.0) - // printf("%d -- %d -- RNA %d : E %lf New_E %lf -- OP %lf OP_POW %lf :: EP %lf EP_POW %lf\n", - // AeTime::time(), - // #ifdef HAVE_MPI - // indiv->exp_m_->exp_m_7_->localXtoGlobalX(indiv->indiv_id / indiv->exp_m_->exp_m_7_->grid_height_)*indiv->exp_m_->exp_m_7_->global_grid_height_+indiv->exp_m_->exp_m_7_->localYtoGlobalY(indiv->indiv_id % indiv->exp_m_->exp_m_7_->grid_height_) - // // indiv_id / grid_height_,indiv_id % grid_height_, - // // localXtoGlobalX(indiv_id / grid_height_),localYtoGlobalY(indiv_id % grid_height_), - // #else - // indiv->indiv_id - // #endif - // , - // begin,e, - // e * - // (indiv->exp_m_->exp_s()->get_hill_shape() / - // (operator_activity_pow_n + indiv->exp_m_->exp_s()->get_hill_shape())) * - // (1 + ((1 / e) - 1) * (enhancer_activity_pow_n / - // (enhancer_activity_pow_n + - // indiv->exp_m_->exp_s()->get_hill_shape()))), operator_activity,operator_activity_pow_n,enhancer_activity,enhancer_activity_pow_n); return e * (exp_manager->exp_s()->get_hill_shape() /