Mercurial > hg > svapp

changeset 698:3e34eeb92647

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Debug tidy
author Chris Cannam
date Thu, 01 Aug 2019 13:48:23 +0100
parents a27a6113fdd7
children 46ab91e26bfe
files framework/Align.cpp
diffstat 1 files changed, 13 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/framework/Align.cpp	Thu Jul 18 14:12:00 2019 +0100
+++ b/framework/Align.cpp	Thu Aug 01 13:48:23 2019 +0100
@@ -229,6 +229,8 @@
         alignmentModel->setPathFrom(rec.preparatory);
         
         m_pendingTuningDiffs[tuningDiffOutputModelId] = rec;
+
+        SVDEBUG << "Align::alignModelViaTransform: Made a note of pending tuning diff output model id " << tuningDiffOutputModelId << " with input " << rec.input << ", alignment model " << rec.alignment << ", preparatory model " << rec.preparatory << endl;
     }
 
     return true;
@@ -241,9 +243,10 @@
 
     if (m_pendingTuningDiffs.find(tuningDiffOutputModelId) ==
         m_pendingTuningDiffs.end()) {
-        SVCERR << "ERROR: Align::tuningDifferenceCompletionChanged: Model "
-               << tuningDiffOutputModelId
-               << " not found in pending tuning diff map!" << endl;
+        SVDEBUG << "NOTE: Align::tuningDifferenceCompletionChanged: Model "
+                << tuningDiffOutputModelId
+                << " not found in pending tuning diff map, probably "
+                << "completed already" << endl;
         return;
     }
 
@@ -290,7 +293,7 @@
     } else {
         SVCERR << "Align::tuningDifferenceCompletionChanged: No tuning frequency reported" << endl;
     }    
-
+    
     ModelById::release(tuningDiffOutputModel);
     
     alignmentModel->setPathFrom({}); // replace preparatoryModel
@@ -298,6 +301,12 @@
     rec.preparatory = {};
     
     m_pendingTuningDiffs.erase(tuningDiffOutputModelId);
+
+    SVDEBUG << "Align::tuningDifferenceCompletionChanged: Erasing model "
+            << tuningDiffOutputModelId << " from pending tuning diffs and "
+            << "launching the alignment phase for alignment model "
+            << rec.alignment << " with tuning frequency "
+            << tuningFrequency << endl;
     
     beginTransformDrivenAlignment
         (rec.input, rec.alignment, tuningFrequency);