From 1235693d2dc59d525c9c1cc9202c4e69af3b9ebd Mon Sep 17 00:00:00 2001
From: kevin <kevin@larke.org>
Date: Sat, 19 Apr 2025 13:40:40 -0400
Subject: [PATCH] main.cpp,cfg/main.cfg : Added cwScoreFollow2 (aka:'sf2') test
 case.

---
 src/cwtest/cfg/main.cfg | 35 +++++++++++++++++++++++++++++++++++
 src/cwtest/main.cpp     |  5 +++++
 2 files changed, 40 insertions(+)

diff --git a/src/cwtest/cfg/main.cfg b/src/cwtest/cfg/main.cfg
index e5f5b40..e488cfe 100644
--- a/src/cwtest/cfg/main.cfg
+++ b/src/cwtest/cfg/main.cfg
@@ -2299,5 +2299,40 @@
 
 
     }
+
+    sf2:
+    {
+        srate:         48000.0,
+        smp_per_cycle: 64,
+        limit_perf_N:  -1,
+	//score_fname:    "~/src/cwtest/src/cwtest/cfg/gutim_full/score/temp.csv",
+	score_fname:    "~/src/caw/src/caw/perf/io/ex_05_score_player/score_20240504.csv"   
+
+	fileL: [
+	  //{ min_perf_noteN:600, max_spuriousN:100, beg_loc:4232, end_loc:4707, folder:"~/src/currawong/audio/workshop/taka1", takeL:[6] },
+	  { min_perf_noteN:600, max_spuriousN:100, beg_loc:4232, end_loc:4707, folder:"~/src/currawong/audio/workshop/beck1", takeL:[0,1,2,3,4,5,6,7,8,9] },
+	  { min_perf_noteN:600, max_spuriousN:100, beg_loc:4232, end_loc:4707, folder:"~/src/currawong/audio/workshop/beck2", takeL:[0,1,2,3,4,5,6,7,8,9] },
+	  { min_perf_noteN:600, max_spuriousN:100, beg_loc:4232, end_loc:4707, folder:"~/src/currawong/audio/workshop/taka1", takeL:[0,1,2,3,4,5,6,7,8,9,10] },
+	  { min_perf_noteN:600, max_spuriousN:100, beg_loc:4232, end_loc:4707, folder:"~/src/currawong/audio/workshop/taka2", takeL:[0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15,16] }
+	]
+
+	follower:
+	{
+	  rpt_fl: false,
+	  
+          pre_affinity_sec:  1.0,
+          post_affinity_sec: 3.0,
+          pre_wnd_sec:       2.0,
+          post_wnd_sec:      5.0,
+        
+          decay_coeff: 0.995,
+
+          d_sec_err_thresh_lo: 0.4,  // reject if d_loc > d_loc_thresh_lod and d_time > d_time_thresh_lo
+          d_loc_thresh_lo:     3,    
+          d_sec_err_thresh_hi: 1.5,  // reject if d_loc != 0 and d_time > d_time_thresh_hi
+          d_loc_thresh_hi:     4,    // reject if d_loc > d_loc_thresh_hi
+          d_loc_stats_thresh:  3,
+        }
+    }
     
 }
diff --git a/src/cwtest/main.cpp b/src/cwtest/main.cpp
index e7bc643..0059034 100644
--- a/src/cwtest/main.cpp
+++ b/src/cwtest/main.cpp
@@ -63,6 +63,9 @@
 #include "cwScoreFollowerPerf.h"
 #include "cwScoreFollower.h"
 #include "cwScoreFollowTest.h"
+
+#include "cwScoreFollow2Test.h"
+
 #include "cwCsv.h"
 
 #if defined(cwWEBSOCK)
@@ -330,6 +333,7 @@ cw::rc_t midiStateTest(      const cw::object_t* cfg, const cw::object_t* args,
 cw::rc_t csvTest(            const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::csv::test(args); }
 cw::rc_t scoreTest(          const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::score_test::test(args); }
 cw::rc_t translateFrags(     const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::preset_sel::translate_frags(args); }
+cw::rc_t scoreFollow2(       const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::score_follow_2::test(args); }
 #if defined(cwWEBSOCK)
 cw::rc_t websockSrvTest(    const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] ) { return cw::websockSrvTest(args); }
 cw::rc_t uiTest( const cw::object_t* cfg, const cw::object_t* args, int argc, const char* argv[] )         { return cw::ui::test(args); }
@@ -514,6 +518,7 @@ int main( int argc, const char* argv[] )
    { "csv", csvTest },
    { "score_test", scoreTest },
    { "translate_frags", translateFrags },
+   { "sf2", scoreFollow2 },
    { "stub", stubTest },
    { nullptr, nullptr }
   };