0000000000000000000000000000000000000000 f7e22e63520841f88c85ca5fbfc8d281281b808d Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1753949400 +0200	branch: Created from refs/remotes/origin/scaling
f7e22e63520841f88c85ca5fbfc8d281281b808d e2c6abae7f02391ffab353cfcb31b1b8feef3493 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1753950023 +0200	pull: Fast-forward
e2c6abae7f02391ffab353cfcb31b1b8feef3493 71a46e26e18837b5c81f4feabeff2a0772b02285 Yanina Tena <yaninatena@Mac.fritz.box> 1754022142 +0200	commit: add testscene for plotting
71a46e26e18837b5c81f4feabeff2a0772b02285 6e4a03a638f70b700ba997bf4be6b42bfeeeba0d Yanina Tena <yaninatena@Mac.fritz.box> 1754052591 +0200	commit: working on analyzing and plotting std of priors and log likelihood
6e4a03a638f70b700ba997bf4be6b42bfeeeba0d 0a03f440404dd7551325a47e8aa5ffea505e04ef Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1754489444 +0200	commit: plots for ccn poster
0a03f440404dd7551325a47e8aa5ffea505e04ef 6f599db86eb8c2e366c10e1d830a9a82314c20e0 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1754638815 +0200	pull: Fast-forward
6f599db86eb8c2e366c10e1d830a9a82314c20e0 0e94fd8b347db3cae69c6799f65a4e60ade6b5b5 Yanina Tena <yaninatena@dot1x-139-153.wlan.uni-giessen.de> 1755077267 +0200	pull: Fast-forward
0e94fd8b347db3cae69c6799f65a4e60ade6b5b5 af264a230118557769d178b259d036e5d036d879 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1755690245 +0200	pull: Fast-forward
af264a230118557769d178b259d036e5d036d879 9ac819c789d898e8f7fb4e0d99c7e1b0eb950698 Yanina Tena <yaninatena@dot1x-139-039.wlan.uni-giessen.de> 1756112607 +0200	commit: adapting code to new data structure; blocked by setsize, time and task
9ac819c789d898e8f7fb4e0d99c7e1b0eb950698 a3e93362244dae8b129433b2ab9f69e74053ae05 Yanina Tena <yaninatena@dot1x-139-039.wlan.uni-giessen.de> 1756112658 +0200	commit: adapting code to new data structure; blocked by setsize, time and task
a3e93362244dae8b129433b2ab9f69e74053ae05 44fdba93c1e9a0be3142fa25d9147d1ea7ac2b26 Yanina Tena <yaninatena@dot1x-139-039.wlan.uni-giessen.de> 1756112718 +0200	commit: adapting code to new data structure; blocked by setsize, time and task
44fdba93c1e9a0be3142fa25d9147d1ea7ac2b26 bc16e8d7e9e36d2483686ec31cab0f0f39a8d9dd Yanina Tena <yaninatena@dot1x-139-039.wlan.uni-giessen.de> 1756112742 +0200	commit: adapting code to new data structure; blocked by setsize, time and task
bc16e8d7e9e36d2483686ec31cab0f0f39a8d9dd 62d06405ceac72ae40d35439864b6dc744e21a32 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756706443 +0200	commit: adjusting code to blocked design
62d06405ceac72ae40d35439864b6dc744e21a32 c02c6a8dd2e5e6d5e1bc0cbad9df7467150e64f8 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756706479 +0200	commit: adjusting code to blocked design
c02c6a8dd2e5e6d5e1bc0cbad9df7467150e64f8 0060e2dafb45942165d4a5aeb07fd328d3f9beed Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756706493 +0200	commit: adjusting code to blocked design
0060e2dafb45942165d4a5aeb07fd328d3f9beed 8a8487a1a9d98b987c587fbdebc9dd372e07a2df Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756706502 +0200	commit: adjusting code to blocked design
8a8487a1a9d98b987c587fbdebc9dd372e07a2df dbb3aa1f3c7614b68f4249d279477c9addccb099 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756706529 +0200	commit: adjusting code to blocked design
dbb3aa1f3c7614b68f4249d279477c9addccb099 611f2fba1abaf4c438838a9d01ee4298c2fafc62 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756706541 +0200	commit: adjusting code to blocked design
611f2fba1abaf4c438838a9d01ee4298c2fafc62 a3e4ba0c1ccd036d9b17551404274e5a5d8398f3 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756707437 +0200	commit: modifying code to blocked design
a3e4ba0c1ccd036d9b17551404274e5a5d8398f3 cfe11e573ea7ba5eaa04af785e0b5747216e6ba9 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756733355 +0200	commit: not showing plots
cfe11e573ea7ba5eaa04af785e0b5747216e6ba9 e96e78cbb01f0d562a39f5bcec012c9b32dddc1e Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756733366 +0200	commit: not showing plots
e96e78cbb01f0d562a39f5bcec012c9b32dddc1e 12e96ff0c58e3249f6517da1c52bcea2e4546a46 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756791783 +0200	commit: establishing BEM model that uses EEM for ensemble trials and IEM for individual trials
12e96ff0c58e3249f6517da1c52bcea2e4546a46 a58b12d015510bc1fe16c0045032512cf599848e Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756791849 +0200	commit: model recovery script for BEM model
a58b12d015510bc1fe16c0045032512cf599848e a86f41763ec241350899757f0cbdda50ccf28805 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756791964 +0200	commit: script for running model recovery of BEM on marc3
a86f41763ec241350899757f0cbdda50ccf28805 cd5eaf5a3281c88844219a100675025b48a4569f Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756792241 +0200	commit: not showing plots
cd5eaf5a3281c88844219a100675025b48a4569f ba0f6d36174172ea0562f6cc1ff546404fea6e57 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1756820897 +0200	commit: fixing forward function
ba0f6d36174172ea0562f6cc1ff546404fea6e57 cc12df041c5d147d1b7c03e40f9536726d49fc86 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1756821145 +0200	commit: fixing forward function
cc12df041c5d147d1b7c03e40f9536726d49fc86 c8da8ee963fa1398651adc233bfd44b982566c33 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1756821751 +0200	commit: working on model recovery
c8da8ee963fa1398651adc233bfd44b982566c33 a1bb65a862c7a9d5bbb49575aaaf130c838dde6f Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1756822204 +0200	commit: renamed EnsemblePerceptionModel.py
a1bb65a862c7a9d5bbb49575aaaf130c838dde6f 0b4b82daa7e20df2c07429076498defe81730d5a Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1756822421 +0200	commit: working on model recovery blocked design
0b4b82daa7e20df2c07429076498defe81730d5a 80d683227e41222762997deaa86a5ee2683d30d3 Yanina Tena <yaninatena@dot1x-234-003.wlan.uni-giessen.de> 1756889317 +0200	commit: included BEM plot
80d683227e41222762997deaa86a5ee2683d30d3 0a3e62e9e0a8bb819edebe3cbc7447805d24ba3b Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756985633 +0200	commit: fixing task variable
0a3e62e9e0a8bb819edebe3cbc7447805d24ba3b a74f223f1b5130432a236b426061782ea157ea5c Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756985726 +0200	commit: fixing task variable
a74f223f1b5130432a236b426061782ea157ea5c 90e93a5bce4d3d7216a3512bfd11d47bd47baa52 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756991007 +0200	commit: fixing task variable
90e93a5bce4d3d7216a3512bfd11d47bd47baa52 e00f48f69a0066e2592721d86ba2e5735fb57ab0 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756991019 +0200	commit: fixing task variable
e00f48f69a0066e2592721d86ba2e5735fb57ab0 ef03f24dd2fb757417d7f02b23dd155818786124 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756991032 +0200	commit: fixing task variable
ef03f24dd2fb757417d7f02b23dd155818786124 620b5f95d2b7f601facc5ae483248430198a3e8a Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756993189 +0200	commit: updated trial number
620b5f95d2b7f601facc5ae483248430198a3e8a 7a25fc43bbe3dcda5623e81020ed96bfcabbcf7f Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756994063 +0200	commit: working on model recovery
7a25fc43bbe3dcda5623e81020ed96bfcabbcf7f 9113fa954816e7bc05b64f53ec4d150dabdbbaf1 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756995583 +0200	commit: working on model recovery
9113fa954816e7bc05b64f53ec4d150dabdbbaf1 53803fc2944d161abc12d798cc2971e924d01e35 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756998715 +0200	commit: working on model recovery
53803fc2944d161abc12d798cc2971e924d01e35 f492cb33860b812e41d4535c1a9d787cce8f6082 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1756998960 +0200	commit: working on model recovery
f492cb33860b812e41d4535c1a9d787cce8f6082 e52f8a1cfc28f78e807c21aa1e8e2a7bb6736e1c Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1757510167 +0200	commit: working on Blocked Participant recovery
e52f8a1cfc28f78e807c21aa1e8e2a7bb6736e1c b84b0938bfa67418bc2cb9225ef8a8ec1f6c64ec Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1757677574 +0200	commit: working on comparison to VP data
b84b0938bfa67418bc2cb9225ef8a8ec1f6c64ec 1c67841c548777705db30178a73d69d7e149dd8c Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1757677812 +0200	commit (merge): merge conflict solved
1c67841c548777705db30178a73d69d7e149dd8c 089598f7c4a03eb7cccc25bf8b282b90df36a794 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1757680053 +0200	commit: working on sig_m
089598f7c4a03eb7cccc25bf8b282b90df36a794 cbebc66d846621bd70867fca3f4acc19e03f23db Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1757686303 +0200	commit: model comparison to VP
cbebc66d846621bd70867fca3f4acc19e03f23db 2892bc2aa05289c51ee6925f18225fa57d6a53ac Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1757687164 +0200	commit: model comparison to VP
2892bc2aa05289c51ee6925f18225fa57d6a53ac 3fbcef746c732efd87ff7d2d9f52c064ff883cfb Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1757688242 +0200	pull temp_origin scaling: Fast-forward
3fbcef746c732efd87ff7d2d9f52c064ff883cfb 3bb53cb3d81d17d710749309044eb94971a1af09 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1757916804 +0200	pull temp_origin scaling: Fast-forward
3bb53cb3d81d17d710749309044eb94971a1af09 195a42cea048c565688a2a9f3d192a40a2289193 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1757946639 +0200	commit: Scripts aligned and repository organized
195a42cea048c565688a2a9f3d192a40a2289193 33f7e9316c78216b53a017b56fd96b59a52deab7 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1757946963 +0200	commit: Scripts aligned and repository organized
33f7e9316c78216b53a017b56fd96b59a52deab7 6bbdc3837545694f211a4cf3295142a218bc6f21 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1757947000 +0200	commit: Scripts aligned and repository organized
6bbdc3837545694f211a4cf3295142a218bc6f21 0e07911af4b2a1340a7e1205cd331264fc72428c Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1757947239 +0200	commit: Scripts aligned and repository organized
0e07911af4b2a1340a7e1205cd331264fc72428c 6d6b8af20b16267b62c0f5d874ba3cf65822a0d4 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1758089749 +0200	commit: finalizing scripts
6d6b8af20b16267b62c0f5d874ba3cf65822a0d4 d7c6d23936c356b9acf1a9e0edbcda845eaaad2a Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1758089946 +0200	pull temp_origin scaling: Merge made by the 'ort' strategy.
d7c6d23936c356b9acf1a9e0edbcda845eaaad2a 4b24ea17b0740104975f919df57357ad95f7c74b Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1758180999 +0200	commit: changed MAX_OPT_STEPS
4b24ea17b0740104975f919df57357ad95f7c74b 991ed94f086629e4b3d9cc238bac95f83a13e55d Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1758181083 +0200	pull temp_origin scaling: Merge made by the 'ort' strategy.
991ed94f086629e4b3d9cc238bac95f83a13e55d d7833efa744190ee378328f4300399595acc3365 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1758615648 +0200	commit: adjusted opt_steps
d7833efa744190ee378328f4300399595acc3365 c7a7d25691cf8feffbd41d7e2d0c8d9c9d472cbd Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1758615695 +0200	pull temp_origin scaling: Merge made by the 'ort' strategy.
c7a7d25691cf8feffbd41d7e2d0c8d9c9d472cbd 33e02d3e14572befe4735c0f796f1299374f9173 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1758615809 +0200	commit: adjusted opt_steps
33e02d3e14572befe4735c0f796f1299374f9173 3f5a4c6b2f362d6476365f5dc5d8b509dab581f6 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1760097847 +0200	pull: Fast-forward
3f5a4c6b2f362d6476365f5dc5d8b509dab581f6 45fd6218a4d9d9da244e8f892a66534ca0186493 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1760113720 +0200	commit: working WM into EEM
45fd6218a4d9d9da244e8f892a66534ca0186493 21c3c0c7f3dbe2b4f9159d5985a7fd206fb699de Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1760337628 +0200	pull: Fast-forward
21c3c0c7f3dbe2b4f9159d5985a7fd206fb699de de7f433a281fbd1d3e965c044950be89cfbf383c Yanina Tena <yaninatena@dot1x-138-045.wlan.uni-giessen.de> 1761119548 +0200	pull: Fast-forward
de7f433a281fbd1d3e965c044950be89cfbf383c 724111f718c6fd93af1717c98290fd0a7d67d407 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1761314585 +0200	commit: working on implementing WM to EEM
724111f718c6fd93af1717c98290fd0a7d67d407 f76641ad045d2871969b161cb11da01b455cdc89 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1761315969 +0200	commit: adjusting test01WMlimitVsIdeal
f76641ad045d2871969b161cb11da01b455cdc89 711e3bfebe9aea24e8d6a909f9f531882939f867 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1761315979 +0200	pull: Merge made by the 'ort' strategy.
711e3bfebe9aea24e8d6a909f9f531882939f867 fd47bf412414908036350dd039ca06a32615a892 Yanina Tena <yaninatena@dot1x-172-145.wlan.uni-giessen.de> 1761566354 +0100	commit: working on parameterRecovery
fd47bf412414908036350dd039ca06a32615a892 ee816fce029f263bbf5ca1d335ebf9eb7be45603 Yanina Tena <yaninatena@dot1x-172-145.wlan.uni-giessen.de> 1761566385 +0100	commit: working on parameterRecovery
ee816fce029f263bbf5ca1d335ebf9eb7be45603 594e1f75b967ca62780d80b9bc8a02555b45218a Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1761647608 +0100	commit: working on ParameterRecovery
594e1f75b967ca62780d80b9bc8a02555b45218a 12734d9f01812b808310aa53fea5b1a359da7197 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1761647833 +0100	commit: added slurm file to run EEMWM test skript on Marc3
12734d9f01812b808310aa53fea5b1a359da7197 1a8242ac2b77cfaf378f2b424a13aff4d8557276 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1761658322 +0100	pull: Fast-forward
1a8242ac2b77cfaf378f2b424a13aff4d8557276 00db1a0e4d1169ab907a79ce71efd4d30cc20b42 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1761658430 +0100	commit: changed to be run on Marc3
00db1a0e4d1169ab907a79ce71efd4d30cc20b42 01aa682c6c15d6336e478e18daac65f2d3be2888 Yanina Tena <yaninatena@dot1x-174-174.wlan.uni-giessen.de> 1762338496 +0100	pull: Fast-forward
01aa682c6c15d6336e478e18daac65f2d3be2888 0719eb029dffb755d146355cdbd7f918a504d31d Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1762517220 +0100	commit: working on Parameterrecovery IEM
0719eb029dffb755d146355cdbd7f918a504d31d c5a155e08f5bf2cc8a76a12fdc14cfe0ba44e404 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1762520029 +0100	pull: Fast-forward
c5a155e08f5bf2cc8a76a12fdc14cfe0ba44e404 1b5fd6e83ad9ed655062f7aa85353f4be82bdeb1 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1762521679 +0100	commit: working on parameter recovery
1b5fd6e83ad9ed655062f7aa85353f4be82bdeb1 18efc460523f8c6da058e5f0430973a977971156 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1762521872 +0100	commit: add slurm file for running IEMWM on Marc3
18efc460523f8c6da058e5f0430973a977971156 fa00cae102e22f73be7e20acb25c9cd09cfcd9b1 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1762523196 +0100	commit: update save directory
fa00cae102e22f73be7e20acb25c9cd09cfcd9b1 90da138d8d7cda61d2a09e05fac325f1b18906b9 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1762523790 +0100	commit: update save directory
90da138d8d7cda61d2a09e05fac325f1b18906b9 894b11633b610a4eeb50d229d3e0df876106ee47 Yanina Tena <yaninatena@dot1x-171-066.wlan.uni-giessen.de> 1762854689 +0100	commit: working on parameter recovery
894b11633b610a4eeb50d229d3e0df876106ee47 99942fb9d9d126636671e4c21c1f40379ee344a5 Yanina Tena <yaninatena@dot1x-171-066.wlan.uni-giessen.de> 1762855076 +0100	commit: updating parameter recovery
99942fb9d9d126636671e4c21c1f40379ee344a5 05708e303612973f46866ae049748a8d7333eb65 Yanina Tena <yaninatena@dot1x-171-066.wlan.uni-giessen.de> 1762856093 +0100	commit: updating plots
05708e303612973f46866ae049748a8d7333eb65 bb7a8917500c923ee827ca3a7fe2e2c3340b11df Yanina Tena <yaninatena@dot1x-171-066.wlan.uni-giessen.de> 1762857731 +0100	commit: updating plots
bb7a8917500c923ee827ca3a7fe2e2c3340b11df b35c1f8c985e951d51241aa54e54ce8db2cb4c5f Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1763039382 +0100	pull: Fast-forward
b35c1f8c985e951d51241aa54e54ce8db2cb4c5f d49d2418cee14871ce629bb1e7bbd69858df0d33 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1763051307 +0100	commit: working on WM implementation in BlockedParticipant models
d49d2418cee14871ce629bb1e7bbd69858df0d33 ee32a79b5de72faaa7c13b4e579b24d67f935c96 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1763655128 +0100	commit: integrating WM to participant scripts
ee32a79b5de72faaa7c13b4e579b24d67f935c96 b877940102fd35f51a232aa52642a33b464c6de7 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1763664144 +0100	pull: Fast-forward
b877940102fd35f51a232aa52642a33b464c6de7 44fb42708909bba01d3ef3e80158fa6a73f22420 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1764960153 +0100	pull: Fast-forward
44fb42708909bba01d3ef3e80158fa6a73f22420 cf57d215e288a13d07f234ee4c467a359dc78a45 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1764961681 +0100	commit: prepare IEM test for test of optimizer steps
cf57d215e288a13d07f234ee4c467a359dc78a45 f5b3768710740ef2858237f85bfa28d2e8c25f00 Yanina Tena <yaninatena@dot1x-171-001.wlan.uni-giessen.de> 1765195579 +0100	commit: working on parameer recovery
f5b3768710740ef2858237f85bfa28d2e8c25f00 b800863e39f0b547db3d09d1d042ab42db8c00a1 Yanina Tena <yaninatena@dot1x-171-001.wlan.uni-giessen.de> 1765199546 +0100	commit: working on paramater recovery
b800863e39f0b547db3d09d1d042ab42db8c00a1 8df57a016e5329d6565e2a453341f0e420d22cab Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1765461020 +0100	commit: working on parameter recovery with WM limit
8df57a016e5329d6565e2a453341f0e420d22cab e4ee76fdf517a1061e8c5b8f9c1183fbbcee1bf1 Yanina Tena <yaninatena@dot1x-175-114.wlan.uni-giessen.de> 1767782654 +0100	pull: Fast-forward
e4ee76fdf517a1061e8c5b8f9c1183fbbcee1bf1 2dd5a632961e85e9f937de81ed7ef8c0eda2cece Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1768398324 +0100	commit: restructuring repository
2dd5a632961e85e9f937de81ed7ef8c0eda2cece ccbac18046e04c140819e379d7d5183bd53e8460 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1768399287 +0100	commit: restructuring repository
ccbac18046e04c140819e379d7d5183bd53e8460 149d0e787c0376d972163f555c74195354c15430 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1768400112 +0100	commit: restructuring repository
149d0e787c0376d972163f555c74195354c15430 fdde4ba4319f5c421543cae47b94410215bb8253 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1768400399 +0100	commit: restructuring repository
fdde4ba4319f5c421543cae47b94410215bb8253 4996ea119c4b277ce50fc30531ff5dec86e4372b Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1768400646 +0100	commit: restructuring repository
4996ea119c4b277ce50fc30531ff5dec86e4372b 27e77acb89c34851685d2bc6a58994528a88897e Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1768400857 +0100	commit: restructuring repository
27e77acb89c34851685d2bc6a58994528a88897e aba04212083bc470744d7ece5191234852220681 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1768401202 +0100	commit: resturcturing repository
aba04212083bc470744d7ece5191234852220681 b7fcbae3e3cfb3d0f27b0feef26f55f7dfc199d8 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1768401276 +0100	commit: restructuring repository
b7fcbae3e3cfb3d0f27b0feef26f55f7dfc199d8 4360ba192c80f0d52d52980ce6da1f0082af6df4 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1768408082 +0100	pull: Fast-forward
4360ba192c80f0d52d52980ce6da1f0082af6df4 ce28551dac49c4cde6f7114901d02392be1a0de2 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1768552658 +0100	commit: adapting Participant scripts
ce28551dac49c4cde6f7114901d02392be1a0de2 140794defde1bf690e546170929dbf5153f4ab04 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1768552680 +0100	commit: adapting Participant scripts
140794defde1bf690e546170929dbf5153f4ab04 e3a1488218533124eaf7c053c43b098ea5ce661f Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1768553290 +0100	commit: restructuring repository
e3a1488218533124eaf7c053c43b098ea5ce661f 4eaad42a4ab4127b532bd69344ec2b2ff5940bf2 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1768571294 +0100	commit: working on integrating WM to Participant models
4eaad42a4ab4127b532bd69344ec2b2ff5940bf2 b4d7a03aefaa60edf7d4ea3e894dc92e1de2ebcd Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1768577645 +0100	pull: Fast-forward
b4d7a03aefaa60edf7d4ea3e894dc92e1de2ebcd 66807419df6cf7ea1f218c3b6f45ea019b73d95d Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1768578381 +0100	pull: Fast-forward
66807419df6cf7ea1f218c3b6f45ea019b73d95d 60fad1ae47fd2d103f4393b61c931c6223acadfc Yanina Tena <yaninatena@dot1x-174-011.wlan.uni-giessen.de> 1768827317 +0100	commit: working on WMLimit Recovery
60fad1ae47fd2d103f4393b61c931c6223acadfc 86b88ea345c94e31f6bc4c13ebb86532e598fc76 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1768893528 +0100	commit: working on WM integration
86b88ea345c94e31f6bc4c13ebb86532e598fc76 29615146aa74f1393510de01ce2d3d1741e33756 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1768893575 +0100	pull: Merge made by the 'ort' strategy.
29615146aa74f1393510de01ce2d3d1741e33756 be78dbf4000dba641cbf2ac3358523ece014da9e Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1768894733 +0100	commit: finalized WM skripts
be78dbf4000dba641cbf2ac3358523ece014da9e 1d941f3cd89070f41a9d1b939277d0db3511b436 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1768894781 +0100	commit: finalized WM skripts
1d941f3cd89070f41a9d1b939277d0db3511b436 cd371a7f35fd34e60a8ab8ffffef79527024e2ab Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1768902763 +0100	commit: implementing WM limit in IEM and EEM models
cd371a7f35fd34e60a8ab8ffffef79527024e2ab fe283c2fcd90f5d25c25b435a2cb127e1272e7e9 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1768914313 +0100	commit: add run_recovery for MARC3 for participant WM scripts
fe283c2fcd90f5d25c25b435a2cb127e1272e7e9 2e36e55f28f98ac9ca77eccc7700d277e1c4e6ff Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1768915185 +0100	commit: fix errors slurm files
2e36e55f28f98ac9ca77eccc7700d277e1c4e6ff 97c013a1c3576df5640df7280762f1cf26d4b896 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1768915637 +0100	commit: fix scripts for running on Marc3
97c013a1c3576df5640df7280762f1cf26d4b896 4b38b6ddb77fd10775870d817fbd20025b8a0340 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1769095410 +0100	commit: working on Model recoveries
4b38b6ddb77fd10775870d817fbd20025b8a0340 e12256e63110111248abccf983ee725729777c7b Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769105265 +0100	commit: working on model comparison
e12256e63110111248abccf983ee725729777c7b 3ee8126da66d2ae6a18e8bbdd05deb6c1a63a7c9 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769169378 +0100	commit: working on model validation
3ee8126da66d2ae6a18e8bbdd05deb6c1a63a7c9 440c2fcae7bc32cc48d367b4fdf7f16d00656c2e Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769179645 +0100	commit: updating slurm files
440c2fcae7bc32cc48d367b4fdf7f16d00656c2e 75ccf2f9079ab52b014bd176ca0565dd5ac13287 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769179654 +0100	pull: Merge made by the 'ort' strategy.
75ccf2f9079ab52b014bd176ca0565dd5ac13287 8820e431e0cf75599e19660954df30d366692f89 Yanina Tena <yaninatena@mac.speedport.ip> 1769331911 +0100	commit: integrating teststructure and preparing files to be run on Marc3
8820e431e0cf75599e19660954df30d366692f89 974e086887d7709d03a22346e88637e8b4cc06d3 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769332486 +0100	commit: preparing for marc3
974e086887d7709d03a22346e88637e8b4cc06d3 b800fdb1967ccb826eeb2512c98860614697a873 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769332845 +0100	commit: fixing slurm file
b800fdb1967ccb826eeb2512c98860614697a873 5437a908ee7c78fae706f0e97ef40f5547b25eb5 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769342815 +0100	commit: integrating teststructure to IEM and preparing files to be run on Marc3
5437a908ee7c78fae706f0e97ef40f5547b25eb5 b106e31802d347607130bf693eb1dc86e65215de Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769343198 +0100	commit: integrating teststructure to BEM and preparing files to be run on Marc3
b106e31802d347607130bf693eb1dc86e65215de 294f3e6f5312f9b7e97a68a56459d03409c80543 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769343336 +0100	commit: integrating teststructure to BEM and preparing files to be run on Marc3
294f3e6f5312f9b7e97a68a56459d03409c80543 d6245e79480096cf201e5a048da646e220ff6a84 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769408594 +0100	commit: fixing bugs
d6245e79480096cf201e5a048da646e220ff6a84 139faeb1210418b09bfc3728873aa2633c2f40fe Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769408833 +0100	commit: fixing bugs
139faeb1210418b09bfc3728873aa2633c2f40fe 7ee69487b4f617014f6ea15e3fbb11892fc79ea6 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769408962 +0100	commit: fixing bugs
7ee69487b4f617014f6ea15e3fbb11892fc79ea6 5820c396cf0917e3c1352d1082fd8cd758cf719e Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769412167 +0100	commit: fixing bugs
5820c396cf0917e3c1352d1082fd8cd758cf719e 2275fa69b1f4f3c10661a8a482473bcbd7f110ed Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769449944 +0100	commit: fixing bugs
2275fa69b1f4f3c10661a8a482473bcbd7f110ed e3514eea4f36ff70acef80b9dd3d74bec9d0e7f0 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769760280 +0100	commit: Rename BEM files and folders to TAEM
e3514eea4f36ff70acef80b9dd3d74bec9d0e7f0 2e388b0b385ed6888243463aead6260aa357e401 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769762621 +0100	commit: Rename BEM files and folders to TAEM
2e388b0b385ed6888243463aead6260aa357e401 ca5465d8369d55a02bc8b1f866dc09287bebf28f Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769853846 +0100	commit: changing sigV
ca5465d8369d55a02bc8b1f866dc09287bebf28f 408d96ff35015bef02b04608ebcee45920258e2d Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769853916 +0100	pull: Merge made by the 'ort' strategy.
408d96ff35015bef02b04608ebcee45920258e2d 1b46172f0b3b1dfe0919c6040a77ef8249fa2cb9 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769855259 +0100	commit: adding behavioral datasets
1b46172f0b3b1dfe0919c6040a77ef8249fa2cb9 dd6ba7cf7ea8fcedb546f0bc3f08b68715b67799 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769855468 +0100	commit: add results files
dd6ba7cf7ea8fcedb546f0bc3f08b68715b67799 890a95cb4508aa5b1be82e109eee898b02f5355d Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769857351 +0100	commit: adding plot script
890a95cb4508aa5b1be82e109eee898b02f5355d 8d39317c878b57886ac9491984bac15c3ed87137 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769868147 +0100	commit: added dataanalysis of 3 models
8d39317c878b57886ac9491984bac15c3ed87137 91c1eece42b72797f875a46ed4ab868680218da3 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1769942302 +0100	commit: adapted for Marc3
91c1eece42b72797f875a46ed4ab868680218da3 e252999e228169d1442eb120555df2e93b3d851c Yanina Tena <yaninatena@Mac.fritz.box> 1769966421 +0100	commit: adapting WM
e252999e228169d1442eb120555df2e93b3d851c cc63a6f8a2d7b37abb9faf2d808adf18c48291dc Yanina Tena <yaninatena@dot1x-174-165.wlan.uni-giessen.de> 1770028587 +0100	commit: working on data presentation
cc63a6f8a2d7b37abb9faf2d808adf18c48291dc efd4a633bfdb044e737a0d69e79b0b7dc2cdf971 Yanina Tena <yaninatena@dot1x-174-165.wlan.uni-giessen.de> 1770028769 +0100	commit: added model comparison results
efd4a633bfdb044e737a0d69e79b0b7dc2cdf971 fda349122943f6c785fab5e93252cbcfc83e362c Yanina Tena <yaninatena@dot1x-174-165.wlan.uni-giessen.de> 1770028798 +0100	commit: added model comparison results
fda349122943f6c785fab5e93252cbcfc83e362c 8447766315d23d514cb6a620fd08760dfd4f9b9a Yanina Tena <yaninatena@dot1x-174-165.wlan.uni-giessen.de> 1770030322 +0100	pull: Fast-forward
8447766315d23d514cb6a620fd08760dfd4f9b9a 7c0e9c781a0903ee234330d9647ddf313382ddc4 Yanina Tena <yaninatena@Mac.fritz.box> 1770276012 +0100	commit: trying out more trials
7c0e9c781a0903ee234330d9647ddf313382ddc4 b0edb437a9458e421696496fa53455c2c0037ec3 Yanina Tena <yaninatena@Mac.fritz.box> 1770363075 +0100	commit: working on model comparison
b0edb437a9458e421696496fa53455c2c0037ec3 f3cecd41db5f0da4c416fefd3b3f5b04d1852dc8 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1770635433 +0100	commit: cleaning repository
f3cecd41db5f0da4c416fefd3b3f5b04d1852dc8 fee4f2dbd87f280629344fa9e5274e98fdc5659d Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1772195303 +0100	pull: Merge made by the 'ort' strategy.
fee4f2dbd87f280629344fa9e5274e98fdc5659d dc7b856d33c3ba021e9159d2e9798744714e0403 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1772207361 +0100	pull: Merge made by the 'ort' strategy.
dc7b856d33c3ba021e9159d2e9798744714e0403 62b13f3fa82612efe77db19757e241d6ba6428b0 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1772208534 +0100	commit: integrating WML to modelcomparison_test
62b13f3fa82612efe77db19757e241d6ba6428b0 40f6f6bb1abd5f0ac4b43e99e8b4fc7e979ae655 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1772208563 +0100	pull: Merge made by the 'ort' strategy.
40f6f6bb1abd5f0ac4b43e99e8b4fc7e979ae655 1e7d18f4c4d16d0b15f50631775f0c0683a5f37b Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1772812273 +0100	commit: working on modelcomparison_test
1e7d18f4c4d16d0b15f50631775f0c0683a5f37b 19292f838a97c84611967335ca3a59d13852735f Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1772812287 +0100	pull: Merge made by the 'ort' strategy.
19292f838a97c84611967335ca3a59d13852735f 2a3958724688809da5073cc7bbb9051bf56a598a Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1773417911 +0100	commit: integrating restriction of parameter variance
2a3958724688809da5073cc7bbb9051bf56a598a b8e794e2fc461ecb4092ae1fa6083c238f799fec Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1773418055 +0100	pull: Merge made by the 'ort' strategy.
b8e794e2fc461ecb4092ae1fa6083c238f799fec 181ee05dfde73fea968eccf30dfbb462621c317b Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1773921141 +0100	pull: Fast-forward
181ee05dfde73fea968eccf30dfbb462621c317b 74f8d7eaa0dcd238a48069b1d6e13a34b286260f Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1773935424 +0100	pull: Fast-forward
74f8d7eaa0dcd238a48069b1d6e13a34b286260f 06fb0b7b912278d5db2627e31f9a73629c27f853 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1773939241 +0100	commit: working on IEM Basic Model tests
06fb0b7b912278d5db2627e31f9a73629c27f853 7a498a1acacd291b1ea9f3437d4a767f7deac7dd Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1773939256 +0100	pull: Merge made by the 'ort' strategy.
7a498a1acacd291b1ea9f3437d4a767f7deac7dd 469ecced77ab5cd4dac9d7677f6cbaffaf3b1807 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1774431928 +0100	commit: implementing posterior update for WM
469ecced77ab5cd4dac9d7677f6cbaffaf3b1807 8477cbe9ba5681ad56cf39b571afc4fb49bcd0e9 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1774615310 +0100	pull: Fast-forward
8477cbe9ba5681ad56cf39b571afc4fb49bcd0e9 961371d73bf259ae2afab81e42df8db974137018 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1774616423 +0100	commit: working on EEM WM test integrating new data structure
961371d73bf259ae2afab81e42df8db974137018 af89a6db08d3abbe5e5d38b97b662df0a76e28e6 Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1774618811 +0100	pull: Fast-forward
af89a6db08d3abbe5e5d38b97b662df0a76e28e6 906d408317366971d4093350261d3dde00b0e85c Yanina Tena <yaninatena@ewla129.WLAN.Uni-Marburg.DE> 1774620697 +0100	commit: working on right number of max opt steps for train model
906d408317366971d4093350261d3dde00b0e85c 12bcea566e96c4274cf25537ccd267a24d2399a7 Yanina Tena <yaninatena@MacBook-Pro-von-Yanina.local> 1774624900 +0100	commit: working on IEM participant models
12bcea566e96c4274cf25537ccd267a24d2399a7 aeaa3966a1fd0856111061fd87fb26c38247dc47 Yanina Tena <yaninatena@dot1x-136-213.wlan.uni-giessen.de> 1774861642 +0200	pull: Fast-forward
aeaa3966a1fd0856111061fd87fb26c38247dc47 9d46a818be7355da6045ef511afe697694c1ff0d Yanina Tena <yaninatena@dot1x-136-213.wlan.uni-giessen.de> 1774869747 +0200	commit: adapting IEMParticipantWML tests to new data format
9d46a818be7355da6045ef511afe697694c1ff0d 43b3785a25dee5e305392017a83b292926af6bab Yanina Tena <yaninatena@dot1x-136-213.wlan.uni-giessen.de> 1774874756 +0200	commit: working on WM limit recovery
43b3785a25dee5e305392017a83b292926af6bab 1afb54e21dfb784d0261c62d7416ea190417c9b2 Yanina Tena <yaninatena@dot1x-138-109.wlan.uni-giessen.de> 1777284238 +0200	commit: structuring repository
1afb54e21dfb784d0261c62d7416ea190417c9b2 45aedf0a3ac811f990f69f9f56e268ddcc7ebb06 Yanina Tena <yaninatena@dot1x-138-109.wlan.uni-giessen.de> 1777284638 +0200	commit: tracking result files
