comparison query.cpp @ 762:ddf08008d45b

A mostly cosmetic fix to query.cpp qpointers allocation, the byte-count vector_size was used a bit too liberally.
author mas01mc
date Fri, 26 Nov 2010 09:35:28 +0000
parents c62041316a44
children b9dbe4611dde
comparison
equal deleted inserted replaced
760:8e796b7b7a47 762:ddf08008d45b
246 uint32_t nvectors = d->nvectors; 246 uint32_t nvectors = d->nvectors;
247 247
248 qpointers->nvectors = nvectors; 248 qpointers->nvectors = nvectors;
249 249
250 size_t vector_size = nvectors * sizeof(double) * d->dim; 250 size_t vector_size = nvectors * sizeof(double) * d->dim;
251 *vector_data = new double[vector_size]; 251 *vector_data = new double[vector_size / sizeof(double) ];
252 memcpy(*vector_data, d->data, vector_size); 252 memcpy(*vector_data, d->data, vector_size);
253 253
254 qpointers->l2norm_data = new double[vector_size / d->dim]; 254 qpointers->l2norm_data = new double[vector_size / (sizeof(double)*d->dim)];
255 audiodb_l2norm_buffer(*vector_data, d->dim, nvectors, qpointers->l2norm_data); 255 audiodb_l2norm_buffer(*vector_data, d->dim, nvectors, qpointers->l2norm_data);
256 audiodb_sequence_sum(qpointers->l2norm_data, nvectors, sequence_length); 256 audiodb_sequence_sum(qpointers->l2norm_data, nvectors, sequence_length);
257 audiodb_sequence_sqrt(qpointers->l2norm_data, nvectors, sequence_length); 257 audiodb_sequence_sqrt(qpointers->l2norm_data, nvectors, sequence_length);
258 258
259 if(d->power) { 259 if(d->power) {
260 qpointers->power_data = new double[vector_size / d->dim]; 260 qpointers->power_data = new double[vector_size / (sizeof(double)*d->dim)];
261 memcpy(qpointers->power_data, d->power, vector_size / d->dim); 261 memcpy(qpointers->power_data, d->power, vector_size / d->dim);
262 audiodb_sequence_sum(qpointers->power_data, nvectors, sequence_length); 262 audiodb_sequence_sum(qpointers->power_data, nvectors, sequence_length);
263 audiodb_sequence_average(qpointers->power_data, nvectors, sequence_length); 263 audiodb_sequence_average(qpointers->power_data, nvectors, sequence_length);
264 } 264 }
265 265