changeset 1884:bdab3a921d5d

Merge

--- a/base/Debug.cpp	Tue Jul 21 13:59:14 2020 +0100
+++ b/base/Debug.cpp	Tue Jul 21 13:59:29 2020 +0100
@@ -32,7 +32,7 @@
 SVDebug &getSVDebug() {
     mutex.lock();
     if (!svdebug) {
-        svdebug = std::make_unique<SVDebug>();
+        svdebug = std::unique_ptr<SVDebug>(new SVDebug());
     }
     mutex.unlock();
     return *svdebug;
@@ -42,9 +42,9 @@
     mutex.lock();
     if (!svcerr) {
         if (!svdebug) {
-            svdebug = std::make_unique<SVDebug>();
+            svdebug = std::unique_ptr<SVDebug>(new SVDebug());
         }
-        svcerr = std::make_unique<SVCerr>(*svdebug);
+        svcerr = std::unique_ptr<SVCerr>(new SVCerr(*svdebug));
     }
     mutex.unlock();
     return *svcerr;

--- a/transform/FeatureExtractionModelTransformer.cpp	Tue Jul 21 13:59:14 2020 +0100
+++ b/transform/FeatureExtractionModelTransformer.cpp	Tue Jul 21 13:59:29 2020 +0100
@@ -249,6 +249,7 @@
 
     for (int j = 0; in_range_for(m_transforms, j); ++j) {
         createOutputModels(j);
+        setCompletion(j, 0);
     }
 
     m_outputMutex.lock();
@@ -360,6 +361,9 @@
 
         // 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);
 
@@ -419,7 +423,8 @@
             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) {
@@ -436,6 +441,9 @@
 
         } else {
 
+            SVDEBUG << "FeatureExtractionModelTransformer::createOutputModels: "
+                    << "creating a RegionModel" << endl;
+
             RegionModel *model;
             if (haveExtents) {
                 model = new RegionModel
@@ -481,6 +489,11 @@
             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
@@ -504,6 +517,10 @@
         // 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);