comparison query.cpp @ 422:a7d61291fbda api-inversion

Baby steps...

Decorate accumulator.h with a preprocessor #define and test; then create
appropriate accumulators in audioDB::query() and delete them if
necessary in audioDB::cleanup().

 #include "audioDB.h"
 #include "reporter.h"
+
+#include "audioDB-internals.h"
+#include "accumulators.h"
 
 bool audioDB::powers_acceptable(double p1, double p2) {
   if (use_absolute_threshold) {
     if ((p1 < absolute_threshold) || (p2 < absolute_threshold)) {
       return false;

   switch (queryType) {
   case O2_POINT_QUERY:
     sequenceLength = 1;
     normalizedDistance = false;
     reporter = new pointQueryReporter< std::greater < NNresult > >(pointNN);
+    accumulator = new DBAccumulator<adb_result_dist_gt>(pointNN);
     break;
   case O2_TRACK_QUERY:
     sequenceLength = 1;
     normalizedDistance = false;
     reporter = new trackAveragingReporter< std::greater< NNresult > >(pointNN, trackNN, dbH->numFiles);
+    accumulator = new PerTrackAccumulator<adb_result_dist_gt>(pointNN, trackNN);
     break;
   case O2_SEQUENCE_QUERY:    
     if(no_unit_norming)
       normalizedDistance = false;
+    accumulator = new PerTrackAccumulator<adb_result_dist_lt>(pointNN, trackNN);
     if(radius == 0) {
       reporter = new trackAveragingReporter< std::less< NNresult > >(pointNN, trackNN, dbH->numFiles);
     } else {
       if(index_exists(dbName, radius, sequenceLength)){
 	char* indexName = index_get_name(dbName, radius, sequenceLength);

     }
     break;
   case O2_N_SEQUENCE_QUERY:
     if(no_unit_norming)
       normalizedDistance = false;
+    accumulator = new PerTrackAccumulator<adb_result_dist_lt>(pointNN, trackNN);
     if(radius == 0) {
       reporter = new trackSequenceQueryNNReporter< std::less < NNresult > >(pointNN, trackNN, dbH->numFiles);
     } else {
       if(index_exists(dbName, radius, sequenceLength)){
 	char* indexName = index_get_name(dbName, radius, sequenceLength);

       else
 	reporter = new trackSequenceQueryRadNNReporter(pointNN,trackNN, dbH->numFiles);
     }
     break;
   case O2_ONE_TO_ONE_N_SEQUENCE_QUERY :
+    accumulator = new NearestAccumulator<adb_result_dist_lt>();
     if(radius == 0) {
       error("query-type not yet supported");
     } else {
       reporter = new trackSequenceQueryRadNNReporterOneToOne(pointNN,trackNN, dbH->numFiles);
     }