From ca076ca3d2e6ad889fa4a9e29b05306f68965544 Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 16:47:51 +0000 Subject: [PATCH 01/19] test file --- test/test_test.py | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 test/test_test.py diff --git a/test/test_test.py b/test/test_test.py new file mode 100644 index 0000000..e69de29 From 10849a71d19ca5d11285f356c3af1475a6917307 Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 17:08:32 +0000 Subject: [PATCH 02/19] add processing test --- test/test_02_processing_test1_csv.py | 4 ++++ 1 file changed, 4 insertions(+) create mode 100644 test/test_02_processing_test1_csv.py diff --git a/test/test_02_processing_test1_csv.py b/test/test_02_processing_test1_csv.py new file mode 100644 index 0000000..88f6518 --- /dev/null +++ b/test/test_02_processing_test1_csv.py @@ -0,0 +1,4 @@ +def test_02_processing_test1_csv(): + import pyWitness + dr = pyWitness.DataRaw("test1.csv") + dp = dr.process() \ No newline at end of file From 8327401da4eef885cada21ba2e093c9e7efde79f Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 17:10:16 +0000 Subject: [PATCH 03/19] add processing test --- test/test_02_processing_test1_csv.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_02_processing_test1_csv.py b/test/test_02_processing_test1_csv.py index 88f6518..80d491f 100644 --- a/test/test_02_processing_test1_csv.py +++ b/test/test_02_processing_test1_csv.py @@ -1,4 +1,4 @@ def test_02_processing_test1_csv(): import pyWitness - dr = pyWitness.DataRaw("test1.csv") + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") dp = dr.process() \ No newline at end of file From 6a60df09db39670c425c1012232bd417687e42b4 Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 17:19:20 +0000 Subject: [PATCH 04/19] add processing test --- test/test_01_loading.py | 3 +++ .../{test_02_processing_test1_csv.py => test_02_processing.py} | 0 2 files changed, 3 insertions(+) create mode 100644 test/test_01_loading.py rename test/{test_02_processing_test1_csv.py => test_02_processing.py} (100%) diff --git a/test/test_01_loading.py b/test/test_01_loading.py new file mode 100644 index 0000000..9f3a30c --- /dev/null +++ b/test/test_01_loading.py @@ -0,0 +1,3 @@ +def test_01_loading_test1_csv(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") \ No newline at end of file diff --git a/test/test_02_processing_test1_csv.py b/test/test_02_processing.py similarity index 100% rename from test/test_02_processing_test1_csv.py rename to test/test_02_processing.py From c6153ce8ed7da91dfd32944696c890c4541756a3 Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 17:22:53 +0000 Subject: [PATCH 05/19] add processing test --- test/test_01_loading.py | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) diff --git a/test/test_01_loading.py b/test/test_01_loading.py index 9f3a30c..00e61d0 100644 --- a/test/test_01_loading.py +++ b/test/test_01_loading.py @@ -1,3 +1,14 @@ def test_01_loading_test1_csv(): import pyWitness - dr = pyWitness.DataRaw("../data/tutorial/test1.csv") \ No newline at end of file + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + +def test_01_loading_test1_csv_check_data(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.checkData() + +def test_01_loading_test1_csv_column_values(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.columnValues("responseTime") + From 8b9eb3c12ab75c6d7236fbe6408baf78247e0df5 Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 17:31:29 +0000 Subject: [PATCH 06/19] add loading and processing test --- test/test_01_loading.py | 3 +++ test/test_02_processing.py | 9 ++++++++- 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/test/test_01_loading.py b/test/test_01_loading.py index 00e61d0..b7a912d 100644 --- a/test/test_01_loading.py +++ b/test/test_01_loading.py @@ -12,3 +12,6 @@ def test_01_loading_test1_csv_column_values(): dr = pyWitness.DataRaw("../data/tutorial/test1.csv") dr.columnValues("responseTime") +def test_01_loading_test1_xlxs(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.xlsx", "test1") diff --git a/test/test_02_processing.py b/test/test_02_processing.py index 80d491f..337b8b7 100644 --- a/test/test_02_processing.py +++ b/test/test_02_processing.py @@ -1,4 +1,11 @@ def test_02_processing_test1_csv(): import pyWitness dr = pyWitness.DataRaw("../data/tutorial/test1.csv") - dp = dr.process() \ No newline at end of file + dp = dr.process() + +def test_02_processing_test1_csv_print_pivots_rates(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dp = dr.process() + dp.printPivot() + dp.printRates() \ No newline at end of file From bb8bef06c444bf151f322d88ef49d6a34bb474cc Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 17:38:06 +0000 Subject: [PATCH 07/19] add tests --- test/test_02_processing.py | 8 +++++++- test/test_03_plotting.py | 14 ++++++++++++++ test/test_04_collapsing.py | 9 +++++++++ 3 files changed, 30 insertions(+), 1 deletion(-) create mode 100644 test/test_03_plotting.py create mode 100644 test/test_04_collapsing.py diff --git a/test/test_02_processing.py b/test/test_02_processing.py index 337b8b7..52322f1 100644 --- a/test/test_02_processing.py +++ b/test/test_02_processing.py @@ -8,4 +8,10 @@ def test_02_processing_test1_csv_print_pivots_rates(): dr = pyWitness.DataRaw("../data/tutorial/test1.csv") dp = dr.process() dp.printPivot() - dp.printRates() \ No newline at end of file + dp.printRates() + +def test_02_processing_test1_csv_descriptive_stats(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dp = dr.process() + dp.printDescriptiveStats() \ No newline at end of file diff --git a/test/test_03_plotting.py b/test/test_03_plotting.py new file mode 100644 index 0000000..9d275ba --- /dev/null +++ b/test/test_03_plotting.py @@ -0,0 +1,14 @@ +def test_03_plotting_test1_csv_plot_roc(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dp = dr.process() + dp.plotROC() + +def test_03_plotting_test1_csv_plot_cac(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dp = dr.process() + dp.plotCAC() + + + diff --git a/test/test_04_collapsing.py b/test/test_04_collapsing.py new file mode 100644 index 0000000..19f122c --- /dev/null +++ b/test/test_04_collapsing.py @@ -0,0 +1,9 @@ +def test_04_collapsing_categorical_data(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseCategoricalData(column='confidence', + map={0: 30, 10: 30, 20: 30, 30: 30, 40: 30, 50: 30, 60: 30, + 70: 75, 80: 75, + 90: 95, 100: 95}) + dp = dr.process() + dp.plotCAC() \ No newline at end of file From 0edf56282cfbb5f3a01c0ecb814132304060bad9 Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 17:47:06 +0000 Subject: [PATCH 08/19] add tests --- test/test_01_loading.py | 2 +- test/test_02_processing.py | 10 +++++++++- test/test_03_plotting.py | 10 ++++++++-- test/test_04_collapsing.py | 16 +++++++++++++++- 4 files changed, 33 insertions(+), 5 deletions(-) diff --git a/test/test_01_loading.py b/test/test_01_loading.py index b7a912d..3ecb6b8 100644 --- a/test/test_01_loading.py +++ b/test/test_01_loading.py @@ -14,4 +14,4 @@ def test_01_loading_test1_csv_column_values(): def test_01_loading_test1_xlxs(): import pyWitness - dr = pyWitness.DataRaw("../data/tutorial/test1.xlsx", "test1") + dr = pyWitness.DataRaw("../data/tutorial/test1.xlsx", "test1") \ No newline at end of file diff --git a/test/test_02_processing.py b/test/test_02_processing.py index 52322f1..c36a60c 100644 --- a/test/test_02_processing.py +++ b/test/test_02_processing.py @@ -14,4 +14,12 @@ def test_02_processing_test1_csv_descriptive_stats(): import pyWitness dr = pyWitness.DataRaw("../data/tutorial/test1.csv") dp = dr.process() - dp.printDescriptiveStats() \ No newline at end of file + dp.printDescriptiveStats() + +def test_02_processing_test1_csv_response_time(): + import pyWitness + drRAC = pyWitness.DataRaw("../data/tutorial/test1.csv") + drRAC.collapseContinuousData(column="responseTime", + bins=[0, 5000, 10000, 15000, 20000, 99999], + labels=[1, 2, 3, 4, 5]) + dpRAC = drRAC.process(reverseConfidence=True, dependentVariable="responseTime") diff --git a/test/test_03_plotting.py b/test/test_03_plotting.py index 9d275ba..0213bab 100644 --- a/test/test_03_plotting.py +++ b/test/test_03_plotting.py @@ -10,5 +10,11 @@ def test_03_plotting_test1_csv_plot_cac(): dp = dr.process() dp.plotCAC() - - +def test_03_plotting_test1_csv_plot_rac(): + import pyWitness + drRAC = pyWitness.DataRaw("../data/tutorial/test1.csv") + drRAC.collapseContinuousData(column="responseTime", + bins=[0, 5000, 10000, 15000, 20000, 99999], + labels=[1, 2, 3, 4, 5]) + dpRAC = drRAC.process(reverseConfidence=True, dependentVariable="responseTime") + dpRAC.plotCAC() \ No newline at end of file diff --git a/test/test_04_collapsing.py b/test/test_04_collapsing.py index 19f122c..a9aa60d 100644 --- a/test/test_04_collapsing.py +++ b/test/test_04_collapsing.py @@ -6,4 +6,18 @@ def test_04_collapsing_categorical_data(): 70: 75, 80: 75, 90: 95, 100: 95}) dp = dr.process() - dp.plotCAC() \ No newline at end of file + dp.plotCAC() + +def test_04_collapsing_continuous_data(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=[1, 2, 3]) + dp = dr.process() + dp.plotROC() + +def test_04_collapsing_continuous_data_pauc(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=[1, 2, 3]) + dp = dr.process() + print(dp.pAUC) \ No newline at end of file From a5d9371ac6a0dcdbf8536e12f009d6b27acc9e33 Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 18:32:20 +0000 Subject: [PATCH 09/19] add tests --- test/test_05_fitting.py | 35 +++++++++++++++++++++++++++++++++++ 1 file changed, 35 insertions(+) create mode 100644 test/test_05_fitting.py diff --git a/test/test_05_fitting.py b/test/test_05_fitting.py new file mode 100644 index 0000000..77eb4a6 --- /dev/null +++ b/test/test_05_fitting.py @@ -0,0 +1,35 @@ +def test_05_fitting_test1_csv_indep_obs_eqvar(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=[1, 2, 3]) + dp = dr.process() + mf = pyWitness.ModelFitIndependentObservation(dp) + mf.setEqualVariance() + mf.fit() + +def test_05_fitting_test1_csv_indep_obs_uneqvar_print_parameters(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=[1, 2, 3]) + dp = dr.process() + mf = pyWitness.ModelFitIndependentObservation(dp) + mf.printParameters() + +def test_05_fitting_test1_csv_best_rest(): + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseContinuousData(column="confidence") + dp = dr.process() + mf_br = pyWitness.ModelFitBestRest(dp) + +def test_05_fitting_test1_csv_ensemble(): + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseContinuousData(column="confidence") + dp = dr.process() + mf_en = pyWitness.ModelFitEnsemble(dp) + +def test_05_fitting_test1_csv_integration(): + dr = pyWitness.DataRaw("test1.csv") + dr.collapseContinuousData(column="confidence") + dp = dr.process() + mf_in = pyWitness.ModelFitIntegration(dp) + From 370845847839151ebde3b39a01ba21f6d8f61500 Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 18:35:28 +0000 Subject: [PATCH 10/19] add tests --- test/test_05_fitting.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_05_fitting.py b/test/test_05_fitting.py index 77eb4a6..9311bc1 100644 --- a/test/test_05_fitting.py +++ b/test/test_05_fitting.py @@ -28,7 +28,7 @@ def test_05_fitting_test1_csv_ensemble(): mf_en = pyWitness.ModelFitEnsemble(dp) def test_05_fitting_test1_csv_integration(): - dr = pyWitness.DataRaw("test1.csv") + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") dr.collapseContinuousData(column="confidence") dp = dr.process() mf_in = pyWitness.ModelFitIntegration(dp) From d301ba14050c1d97e034228917becd03d12c82ee Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 18:42:15 +0000 Subject: [PATCH 11/19] add tests --- test/test_05_fitting.py | 3 +++ test/test_06_fitting_test1_csv_set_parameters.py | 16 ++++++++++++++++ 2 files changed, 19 insertions(+) create mode 100644 test/test_06_fitting_test1_csv_set_parameters.py diff --git a/test/test_05_fitting.py b/test/test_05_fitting.py index 9311bc1..7c330fe 100644 --- a/test/test_05_fitting.py +++ b/test/test_05_fitting.py @@ -16,18 +16,21 @@ def test_05_fitting_test1_csv_indep_obs_uneqvar_print_parameters(): mf.printParameters() def test_05_fitting_test1_csv_best_rest(): + import pyWitness dr = pyWitness.DataRaw("../data/tutorial/test1.csv") dr.collapseContinuousData(column="confidence") dp = dr.process() mf_br = pyWitness.ModelFitBestRest(dp) def test_05_fitting_test1_csv_ensemble(): + import pyWitness dr = pyWitness.DataRaw("../data/tutorial/test1.csv") dr.collapseContinuousData(column="confidence") dp = dr.process() mf_en = pyWitness.ModelFitEnsemble(dp) def test_05_fitting_test1_csv_integration(): + import pyWitness dr = pyWitness.DataRaw("../data/tutorial/test1.csv") dr.collapseContinuousData(column="confidence") dp = dr.process() diff --git a/test/test_06_fitting_test1_csv_set_parameters.py b/test/test_06_fitting_test1_csv_set_parameters.py new file mode 100644 index 0000000..dabfec7 --- /dev/null +++ b/test/test_06_fitting_test1_csv_set_parameters.py @@ -0,0 +1,16 @@ +def test_06_fitting_test1_csv_set_parameters_plot_hit_v_false(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=[1, 2, 3]) + dp = dr.process() + dp.plotHitVsFalseAlarmRate() + savefig('HvFA.png') + +def test_06_fitting_test1_csv_set_parameters_print_parameters(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=[1, 2, 3]) + dp = dr.process() + mf = pyWitness.ModelFitIndependentObservation(dp) + mf.printParameters() + From 5835c4a1f3cadcc8dc7a52623d22f1bbbec3e1f1 Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 19:09:41 +0000 Subject: [PATCH 12/19] add tests --- test/test_06_fitting_test1_csv_set_parameters.py | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/test/test_06_fitting_test1_csv_set_parameters.py b/test/test_06_fitting_test1_csv_set_parameters.py index dabfec7..13ee69c 100644 --- a/test/test_06_fitting_test1_csv_set_parameters.py +++ b/test/test_06_fitting_test1_csv_set_parameters.py @@ -14,3 +14,11 @@ def test_06_fitting_test1_csv_set_parameters_print_parameters(): mf = pyWitness.ModelFitIndependentObservation(dp) mf.printParameters() +def test_06_fitting_test1_csv_set_parameters_set_equal_var(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=[1, 2, 3]) + dp = dr.process() + mf.setEqualVariance() + mf.setParameterEstimates() + mf.printParameters() \ No newline at end of file From fed36e1e4737b26a262985277b39af367dc98fa8 Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 19:12:44 +0000 Subject: [PATCH 13/19] add tests --- test/test_06_fitting_test1_csv_set_parameters.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test_06_fitting_test1_csv_set_parameters.py b/test/test_06_fitting_test1_csv_set_parameters.py index 13ee69c..6246e1e 100644 --- a/test/test_06_fitting_test1_csv_set_parameters.py +++ b/test/test_06_fitting_test1_csv_set_parameters.py @@ -4,7 +4,6 @@ def test_06_fitting_test1_csv_set_parameters_plot_hit_v_false(): dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=[1, 2, 3]) dp = dr.process() dp.plotHitVsFalseAlarmRate() - savefig('HvFA.png') def test_06_fitting_test1_csv_set_parameters_print_parameters(): import pyWitness @@ -19,6 +18,7 @@ def test_06_fitting_test1_csv_set_parameters_set_equal_var(): dr = pyWitness.DataRaw("../data/tutorial/test1.csv") dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=[1, 2, 3]) dp = dr.process() + mf = pyWitness.ModelFitIndependentObservation(dp) mf.setEqualVariance() mf.setParameterEstimates() mf.printParameters() \ No newline at end of file From f37aa8ac6b571a64bd4f99a53b06fd8d162347b8 Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 19:16:59 +0000 Subject: [PATCH 14/19] add tests --- test/test_05_fitting.py | 24 +++++++++++++++++++ ...est_06_fitting_test1_csv_set_parameters.py | 24 ------------------- 2 files changed, 24 insertions(+), 24 deletions(-) delete mode 100644 test/test_06_fitting_test1_csv_set_parameters.py diff --git a/test/test_05_fitting.py b/test/test_05_fitting.py index 7c330fe..31f082d 100644 --- a/test/test_05_fitting.py +++ b/test/test_05_fitting.py @@ -36,3 +36,27 @@ def test_05_fitting_test1_csv_integration(): dp = dr.process() mf_in = pyWitness.ModelFitIntegration(dp) +def test_05_fitting_test1_csv_set_parameters_plot_hit_v_false(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=[1, 2, 3]) + dp = dr.process() + dp.plotHitVsFalseAlarmRate() + +def test_05_fitting_test1_csv_set_parameters_print_parameters(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=[1, 2, 3]) + dp = dr.process() + mf = pyWitness.ModelFitIndependentObservation(dp) + mf.printParameters() + +def test_05_fitting_test1_csv_set_parameters_set_equal_var(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=[1, 2, 3]) + dp = dr.process() + mf = pyWitness.ModelFitIndependentObservation(dp) + mf.setEqualVariance() + mf.setParameterEstimates() + mf.printParameters() \ No newline at end of file diff --git a/test/test_06_fitting_test1_csv_set_parameters.py b/test/test_06_fitting_test1_csv_set_parameters.py deleted file mode 100644 index 6246e1e..0000000 --- a/test/test_06_fitting_test1_csv_set_parameters.py +++ /dev/null @@ -1,24 +0,0 @@ -def test_06_fitting_test1_csv_set_parameters_plot_hit_v_false(): - import pyWitness - dr = pyWitness.DataRaw("../data/tutorial/test1.csv") - dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=[1, 2, 3]) - dp = dr.process() - dp.plotHitVsFalseAlarmRate() - -def test_06_fitting_test1_csv_set_parameters_print_parameters(): - import pyWitness - dr = pyWitness.DataRaw("../data/tutorial/test1.csv") - dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=[1, 2, 3]) - dp = dr.process() - mf = pyWitness.ModelFitIndependentObservation(dp) - mf.printParameters() - -def test_06_fitting_test1_csv_set_parameters_set_equal_var(): - import pyWitness - dr = pyWitness.DataRaw("../data/tutorial/test1.csv") - dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=[1, 2, 3]) - dp = dr.process() - mf = pyWitness.ModelFitIndependentObservation(dp) - mf.setEqualVariance() - mf.setParameterEstimates() - mf.printParameters() \ No newline at end of file From 154f0c76624ad91010a37a91fc755eba018313b2 Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 19:23:08 +0000 Subject: [PATCH 15/19] add tests --- test/test_05_fitting.py | 39 ++++++++++++++++++++++++++++++++++++++- 1 file changed, 38 insertions(+), 1 deletion(-) diff --git a/test/test_05_fitting.py b/test/test_05_fitting.py index 31f082d..f071a3c 100644 --- a/test/test_05_fitting.py +++ b/test/test_05_fitting.py @@ -59,4 +59,41 @@ def test_05_fitting_test1_csv_set_parameters_set_equal_var(): mf = pyWitness.ModelFitIndependentObservation(dp) mf.setEqualVariance() mf.setParameterEstimates() - mf.printParameters() \ No newline at end of file + mf.printParameters() + +def test_05_fitting_test1_csv_plot_fit_roc(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=None) + dp = dr.process() + dp.calculateConfidenceBootstrap(nBootstraps=200) + mf = pyWitness.ModelFitIndependentObservation(dp) + mf.setEqualVariance() + mf.fit() + dp.plotROC(label="Data") + mf.plotROC(label="Indep. obs. fit") + +def test_05_fitting_test1_csv_plot_fit(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=None) + dp = dr.process() + dp.calculateConfidenceBootstrap(nBootstraps=200) + mf = pyWitness.ModelFitIndependentObservation(dp) + mf.setEqualVariance() + mf.fit() + dp.plotROC(label="Data") + mf.plotROC(label="Indep. obs. fit") + mf.plotFit() + +def test_05_fitting_test1_csv_plot_fit_cac(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=None) + dp = dr.process() + dp.calculateConfidenceBootstrap(nBootstraps=200) + mf = pyWitness.ModelFitIndependentObservation(dp) + mf.setEqualVariance() + mf.fit() + dp.plotCAC(label="Data") + mf.plotCAC(label="Indep. obs. fit") \ No newline at end of file From 11c1592701c8e75edfff93760729d6f871638e22 Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 19:27:34 +0000 Subject: [PATCH 16/19] remove old tests --- test/test_test.py | 0 test/test_test1_tutorial1.py | 5 ----- test/test_test1_tutorial1_check.py | 7 ------- test/test_test1_tutorial2.py | 6 ------ 4 files changed, 18 deletions(-) delete mode 100644 test/test_test.py delete mode 100644 test/test_test1_tutorial1.py delete mode 100644 test/test_test1_tutorial1_check.py delete mode 100644 test/test_test1_tutorial2.py diff --git a/test/test_test.py b/test/test_test.py deleted file mode 100644 index e69de29..0000000 diff --git a/test/test_test1_tutorial1.py b/test/test_test1_tutorial1.py deleted file mode 100644 index ccabdf7..0000000 --- a/test/test_test1_tutorial1.py +++ /dev/null @@ -1,5 +0,0 @@ -import pyWitness - -def test_test1_tutorial1() : - dr = pyWitness.DataRaw("../data/tutorial/test1.csv") - diff --git a/test/test_test1_tutorial1_check.py b/test/test_test1_tutorial1_check.py deleted file mode 100644 index bbcd6d1..0000000 --- a/test/test_test1_tutorial1_check.py +++ /dev/null @@ -1,7 +0,0 @@ -import pyWitness - -def test_test1_load() : - import pyWitness - dr = pyWitness.DataRaw("../data/tutorial/test1.csv") - assert len(dr.data) == 890, "test_tutorialCode1 wrong number of participants" - diff --git a/test/test_test1_tutorial2.py b/test/test_test1_tutorial2.py deleted file mode 100644 index 949c4b6..0000000 --- a/test/test_test1_tutorial2.py +++ /dev/null @@ -1,6 +0,0 @@ -import pyWitness - -def test_test1_tutorial2(): - dr = pyWitness.DataRaw("../data/tutorial/test1.csv") - dr.checkData() - From 772da5cb23fe4cc7ae6021517d2d1aa7a9752cba Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 19:36:49 +0000 Subject: [PATCH 17/19] remove old tests --- test/test_06_adv_stats.py | 30 ++++++++++++++++++++++++++++++ 1 file changed, 30 insertions(+) create mode 100644 test/test_06_adv_stats.py diff --git a/test/test_06_adv_stats.py b/test/test_06_adv_stats.py new file mode 100644 index 0000000..520f0d9 --- /dev/null +++ b/test/test_06_adv_stats.py @@ -0,0 +1,30 @@ +def test_adv_stats_test1_csv_bootstrap(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=None) + dp = dr.process() + dp.calculateConfidenceBootstrap(nBootstraps=200, cl=95) + dp.printPivot() + dp.printRates() + +def test_adv_stats_test2_csv_processing_two_conditions(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test2.csv") + dr.cutData(column="previouslyViewedVideo", value=1, option="keep") + dpControl = dr.process(column="group", condition="Control") + dpVerbal = dr.process(column="group", condition="Verbal") + minRate = min(dpControl.liberalTargetAbsentSuspectId, dpVerbal.liberalTargetAbsentSuspectId) + +def test_adv_stats_test2_csv_compare_two_pauc(): + import pyWitness + dr = pyWitness.DataRaw("test2.csv") + dr.cutData(column="previouslyViewedVideo", value=1, option="keep") + dpControl = dr.process(column="group", condition="Control") + dpVerbal = dr.process(column="group", condition="Verbal") + minRate = min(dpControl.liberalTargetAbsentSuspectId, dpVerbal.liberalTargetAbsentSuspectId) + dpControl = dr.process("group", "Control", pAUCLiberal=minRate) + dpControl.calculateConfidenceBootstrap(nBootstraps=200) + dpVerbal = dr.process("group", "Verbal", pAUCLiberal=minRate) + dpVerbal.calculateConfidenceBootstrap(nBootstraps=200) + dpControl.comparePAUC(dpVerbal) + From 06b427f28ed959dbe4781b69f10cb70dda0e07ae Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 19:42:47 +0000 Subject: [PATCH 18/19] add tests --- test/test_06_adv_stats.py | 34 +++++++++++++++++++++++++++++++++- 1 file changed, 33 insertions(+), 1 deletion(-) diff --git a/test/test_06_adv_stats.py b/test/test_06_adv_stats.py index 520f0d9..d933b03 100644 --- a/test/test_06_adv_stats.py +++ b/test/test_06_adv_stats.py @@ -17,7 +17,7 @@ def test_adv_stats_test2_csv_processing_two_conditions(): def test_adv_stats_test2_csv_compare_two_pauc(): import pyWitness - dr = pyWitness.DataRaw("test2.csv") + dr = pyWitness.DataRaw("../data/tutorial/test2.csv") dr.cutData(column="previouslyViewedVideo", value=1, option="keep") dpControl = dr.process(column="group", condition="Control") dpVerbal = dr.process(column="group", condition="Verbal") @@ -28,3 +28,35 @@ def test_adv_stats_test2_csv_compare_two_pauc(): dpVerbal.calculateConfidenceBootstrap(nBootstraps=200) dpControl.comparePAUC(dpVerbal) +def test_adv_stats_test1_csv_generate_sdt_data(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=None) + dp = dr.process() + mf = pyWitness.ModelFitIndependentObservation(dp, debug=True) + mf.setEqualVariance() + mf.fit() + dr1 = mf.generateRawData(nGenParticipants=10000) + + # Need to process the synthetic data + dp1 = dr1.process() + + # calculate uncertainties using bootstrap + dp.calculateConfidenceBootstrap() + dp1.calculateConfidenceBootstrap() + +def test_adv_stats_test1_csv_power_analysis(): + import pyWitness + dr = pyWitness.DataRaw("../data/tutorial/test1.csv") + dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=None) + dp = dr.process() + mf = pyWitness.ModelFitIndependentObservation(dp, debug=False) + mf.setEqualVariance() + mf.fit() + + for nGen in numpy.linspace(500, 5000, 9 + 1): + drSimulated = mf.generateRawData(nGenParticipants=nGen) + dpSimulated = drSimulated.process() + dpSimulated.calculateConfidenceBootstrap(nBootstraps=2000) + print(nGen, dpSimulated.liberalTargetAbsentSuspectId, dpSimulated.pAUC, dpSimulated.pAUC_low, + dpSimulated.pAUC_high) \ No newline at end of file From ea1a2759c0e8e78dbba4b65cb03efbda0c8b2319 Mon Sep 17 00:00:00 2001 From: Laura Mickes Date: Mon, 6 Jan 2025 19:46:01 +0000 Subject: [PATCH 19/19] add tests --- test/test_06_adv_stats.py | 1 + 1 file changed, 1 insertion(+) diff --git a/test/test_06_adv_stats.py b/test/test_06_adv_stats.py index d933b03..dac336b 100644 --- a/test/test_06_adv_stats.py +++ b/test/test_06_adv_stats.py @@ -47,6 +47,7 @@ def test_adv_stats_test1_csv_generate_sdt_data(): def test_adv_stats_test1_csv_power_analysis(): import pyWitness + import numpy dr = pyWitness.DataRaw("../data/tutorial/test1.csv") dr.collapseContinuousData(column="confidence", bins=[-1, 60, 80, 100], labels=None) dp = dr.process()