remove branches

improvement-multiple_buffers
Oli 3 years ago
parent cb979d6d30
commit 7c2a76c248

@ -94,8 +94,6 @@ chunk_array_t* chunk_array_create(char* filename, size_t total_size) {
return NULL;
}
printf("totalsize %d\n", total_size);
chunk_array->chunk_size = min(MAX_CHUNK_SIZE, total_size);
chunk_array->buffers = malloc(sizeof(buffer_t) * N_BUFFERS);
@ -130,27 +128,16 @@ chunk_array_t* chunk_array_create(char* filename, size_t total_size) {
}
buffer_t* chunk_array_update(chunk_array_t* chunk_array, size_t pos) {
////printf("[%s] miss: %d\n",chunk_array->filename, pos);
//buffer_t* buffer = chunk_array->buffers[0];
//int distance = abs(buffer->init_pos - pos);
srand(time(NULL)); // Initialization, should only be called once.
int random = rand()%chunk_array->n_buffers;
while (random == chunk_array->last_updated) {
//printf("ACA!\n");
random = rand()%chunk_array->n_buffers;
}
chunk_array->last_updated = random;
/*for(int i=1; i<chunk_array->n_buffers; i++) {
int new_distance = abs(chunk_array->buffers[i]->init_pos - pos);
if (new_distance < distance) {
distance = new_distance;
buffer = chunk_array->buffers[i];
}
}*/
buffer_t* buffer = chunk_array->buffers[random];
buffer_update(chunk_array, buffer, pos);
return buffer;

@ -60,13 +60,9 @@ void FFTMA2(struct vario_mod variogram, struct grid_mod grid, int n[3], struct r
worki = (double*)malloc(nmax * sizeof(double));
testmemory(worki);
printf("empece covariance\n");
/*covariance function creation*/
covariance(covar, variogram, grid, n);
printf("termine covariance\n");
ireal = chunk_array_create("ireal.txt", ntot);
/*power spectrum*/

Loading…
Cancel
Save