comparison transform/FeatureExtractionModelTransformer.cpp @ 1884:bdab3a921d5d

Merge

         }
     }
 
     for (int j = 0; in_range_for(m_transforms, j); ++j) {
         createOutputModels(j);
+        setCompletion(j, 0);
     }
 
     m_outputMutex.lock();
     m_haveOutputs = true;
     m_outputsCondition.wakeAll();

     if (binCount == 0 &&
         (preDurationPlugin || !m_descriptors[n].hasDuration)) {
 
         // Anything with no value and no duration is an instant
 
+        SVDEBUG << "FeatureExtractionModelTransformer::createOutputModels: "
+                << "creating a SparseOneDimensionalModel" << endl;
+        
         out = std::make_shared<SparseOneDimensionalModel>
             (modelRate, modelResolution, false);
 
         QString outputEventTypeURI = description.getOutputEventTypeURI(outputId);
         out->setRDFTypeURI(outputEventTypeURI);

             QSettings settings;
             settings.beginGroup("Transformer");
             bool flexi = settings.value("use-flexi-note-model", false).toBool();
             settings.endGroup();
 
-            SVCERR << "flexi = " << flexi << endl;
+            SVDEBUG << "FeatureExtractionModelTransformer::createOutputModels: "
+                    << "creating a NoteModel (flexi = " << flexi << ")" << endl;
             
             NoteModel *model;
             if (haveExtents) {
                 model = new NoteModel
                     (modelRate, modelResolution, minValue, maxValue, false,

             model->setScaleUnits(m_descriptors[n].unit.c_str());
             out.reset(model);
 
         } else {
 
+            SVDEBUG << "FeatureExtractionModelTransformer::createOutputModels: "
+                    << "creating a RegionModel" << endl;
+
             RegionModel *model;
             if (haveExtents) {
                 model = new RegionModel
                     (modelRate, modelResolution, minValue, maxValue, false);
             } else {

 
         if (!haveBinCount || binCount > 1) {
             m_needAdditionalModels[n] = true;
         }
 
+        SVDEBUG << "FeatureExtractionModelTransformer::createOutputModels: "
+                << "creating a SparseTimeValueModel "
+                << "(additional models to come? -> "
+                << m_needAdditionalModels[n] << ")" << endl;
+
         SparseTimeValueModel *model;
         if (haveExtents) {
             model = new SparseTimeValueModel
                 (modelRate, modelResolution, minValue, maxValue, false);
         } else {

 
         // Anything that is not a 1D, note, or interval model and that
         // has a fixed sample rate and more than one value per result
         // must be a dense 3D model.
 
+        SVDEBUG << "FeatureExtractionModelTransformer::createOutputModels: "
+                << "creating a BasicCompressedDenseThreeDimensionalModel"
+                << endl;
+        
         auto model =
             new BasicCompressedDenseThreeDimensionalModel
             (modelRate, modelResolution, binCount, false);
 
         if (!m_descriptors[n].binNames.empty()) {