refactor

BoysTownOrg · Jul 9, 2019 · f7e465e · f7e465e
1 parent 1dc008c
commit f7e465e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/src/recognition-test/RecognitionTestModel.cpp b/src/recognition-test/RecognitionTestModel.cpp
@@ -172,6 +172,10 @@ namespace av_speech_in_noise {
 
     void FixedLevelMethod::loadTargets(const std::string &p) {
         targetList->loadFromDirectory(p);
+        updateCompletion();
+    }
+
+    void FixedLevelMethod::updateCompletion() {
         complete_ = targetList->empty();
     }
 
@@ -212,7 +216,7 @@ namespace av_speech_in_noise {
     void FixedLevelMethod::submitResponse(
         const coordinate_response_measure::SubjectResponse &
     ) {
-        complete_ = targetList->empty();
+        updateCompletion();
     }
 
     void FixedLevelMethod::submitResponse(const FreeResponse &) {
@@ -227,8 +231,13 @@ namespace av_speech_in_noise {
         int snr_dB() override { return {}; }
         void submitCorrectResponse() override {}
         void submitIncorrectResponse() override {}
-        void writeTrial(OutputFile *, const coordinate_response_measure::SubjectResponse &) override {}
-        void submitResponse(const coordinate_response_measure::SubjectResponse &) override {}
+        void writeTrial(
+            OutputFile *,
+            const coordinate_response_measure::SubjectResponse &
+        ) override {}
+        void submitResponse(
+            const coordinate_response_measure::SubjectResponse &
+        ) override {}
         void submitResponse(const FreeResponse &) override {}
     };
 

diff --git a/src/recognition-test/RecognitionTestModel.hpp b/src/recognition-test/RecognitionTestModel.hpp
@@ -246,6 +246,8 @@ namespace av_speech_in_noise {
             const coordinate_response_measure::SubjectResponse &
         ) override;
         void submitResponse(const FreeResponse &) override;
+    private:
+        void updateCompletion();
     };
 
     class RecognitionTestModel :