Commit 346e781b authored by Leonardo Solis's avatar Leonardo Solis
Browse files

minor renaming and cleanup


Former-commit-id: e72add2e
parent c50039c8
......@@ -104,7 +104,7 @@ float map_angle_360(float angle)
}
// --------------------------------------------------------------------------
// Lamarckian Genetic-Algorithm (GA): GA + LS (Local Search)
// Traditional (Non-Lamarckian) Genetic-Algorithm: GA
// Originally from: searchoptimum.c
// --------------------------------------------------------------------------
__kernel __attribute__ ((max_global_work_dim(0)))
......@@ -126,9 +126,6 @@ void Krnl_GA(__global float* restrict GlobPopulationCurrent,
float Host_two_absmaxdmov,
float Host_two_absmaxdang,
float DockConst_crossover_rate,
#if 0
unsigned int DockConst_num_of_lsentities,
#endif
unsigned char DockConst_num_of_genes
#if defined(SINGLE_COPY_POP_ENE)
,
......@@ -171,15 +168,15 @@ void Krnl_GA(__global float* restrict GlobPopulationCurrent,
write_channel_intel(chan_GA2IGL_IC_active, true);
mem_fence(CLK_CHANNEL_MEM_FENCE);
for (uchar pipe_cnt=0; pipe_cnt<DockConst_num_of_genes; pipe_cnt++) {
for (uchar gene_cnt=0; gene_cnt<DockConst_num_of_genes; gene_cnt++) {
float tmp_ic;
#if defined(SINGLE_COPY_POP_ENE)
tmp_ic = GlobPopCurr[pop_cnt*ACTUAL_GENOTYPE_LENGTH + pipe_cnt];
tmp_ic = GlobPopCurr[pop_cnt*ACTUAL_GENOTYPE_LENGTH + gene_cnt];
#else
tmp_ic = GlobPopulationCurrent[pop_cnt*ACTUAL_GENOTYPE_LENGTH + pipe_cnt];
tmp_ic = GlobPopulationCurrent[pop_cnt*ACTUAL_GENOTYPE_LENGTH + gene_cnt];
#endif
LocalPopCurr[pop_cnt][pipe_cnt & MASK_GENOTYPE] = tmp_ic;
LocalPopCurr[pop_cnt][gene_cnt & MASK_GENOTYPE] = tmp_ic;
write_channel_intel(chan_IC2Conf_genotype, tmp_ic);
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment