Skip to content

Fix timing #4

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
steelec merged 3 commits into from
Jun 23, 2022
Merged

Fix timing #4

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
dfd8a57
updated presentation delay to round nearest ms, logs
steelec Jun 23, 2022
ad55d19
bumped version
steelec Jun 23, 2022
e7f3328
updated terminal output
steelec Jun 23, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@

<groupId>com.github.neuralabc.spft</groupId>
<artifactId>spft</artifactId>
<version>1.0-SNAPSHOT</version>
<version>1.1-SNAPSHOT</version>
<name>Sequence Pinch Force Task</name>
<description>A Java implementation of a Sequence Pinch Force task</description>

Expand Down
2 changes: 1 addition & 1 deletion spft/testing/2022_06_test_right_only/onetrial_SPFT_LAB_data.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,5 +21,5 @@ blocks:

sequences:
smp:
frequency: 160
frequency: 100
valuesLeft: [0.5429, 0.5571, 0.5667, 0.5810, 0.5952, 0.6095, 0.6238, 0.6381, 0.6524, 0.6667, 0.6762, 0.6905, 0.7048, 0.7143, 0.7286, 0.7381, 0.7524, 0.7619, 0.7714, 0.7857, 0.7952, 0.8048, 0.8143, 0.8190, 0.8286, 0.8381, 0.8476, 0.8524, 0.8571, 0.8667, 0.8714, 0.8762, 0.8810, 0.8857, 0.8905, 0.8905, 0.8952, 0.8952, 0.8952, 0.9000, 0.9000, 0.9000, 0.8952, 0.8952, 0.8952, 0.8905, 0.8905, 0.8857, 0.8810, 0.8762, 0.8714, 0.8667, 0.8571, 0.8524, 0.8476, 0.8381, 0.8286, 0.8190, 0.8143, 0.8048, 0.7952, 0.7857, 0.7714, 0.7619, 0.7524, 0.7381, 0.7286, 0.7143, 0.7048, 0.6905, 0.6762, 0.6667, 0.6524, 0.6381, 0.6238, 0.6095, 0.5952, 0.5810, 0.5667, 0.5571, 0.5429, 0.5286, 0.5143, 0.5000, 0.4857, 0.4714, 0.4571, 0.4429, 0.4286, 0.4190, 0.4048, 0.3905, 0.3810, 0.3667, 0.3524, 0.3429, 0.3333, 0.3190, 0.3095, 0.3000, 0.2905, 0.2810, 0.2714, 0.2619, 0.2524, 0.2429, 0.2381, 0.2286, 0.2238, 0.2143, 0.2095, 0.2048, 0.2000, 0.1952, 0.1952, 0.1905, 0.1905, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1905, 0.1905, 0.1952, 0.1952, 0.2000, 0.2048, 0.2095, 0.2143, 0.2238, 0.2286, 0.2381, 0.2429, 0.2524, 0.2619, 0.2714, 0.2810, 0.2905, 0.3000, 0.3095, 0.3190, 0.3333, 0.3429, 0.3524, 0.3667, 0.3810, 0.3905, 0.4048, 0.4190, 0.4286, 0.4429, 0.4571, 0.4714, 0.4857, 0.5000, 0.5143, 0.5286, 0.5429, 0.5571, 0.5667, 0.5810, 0.5952, 0.6095, 0.6238, 0.6381, 0.6524, 0.6667, 0.6762, 0.6905, 0.7048, 0.7143, 0.7286, 0.7381, 0.7524, 0.7619, 0.7714, 0.7857, 0.7952, 0.8048, 0.8143, 0.8190, 0.8286, 0.8381, 0.8476, 0.8524, 0.8571, 0.8667, 0.8714, 0.8762, 0.8810, 0.8857, 0.8905, 0.8905, 0.8952, 0.8952, 0.8952, 0.9000, 0.9000, 0.9000, 0.8952, 0.8952, 0.8952, 0.8905, 0.8905, 0.8857, 0.8810, 0.8762, 0.8714, 0.8667, 0.8571, 0.8524, 0.8476, 0.8381, 0.8286, 0.8190, 0.8143, 0.8048, 0.7952, 0.7857, 0.7714, 0.7619, 0.7524, 0.7381, 0.7286, 0.7143, 0.7048, 0.6905, 0.6762, 0.6667, 0.6524, 0.6381, 0.6238, 0.6095, 0.5952, 0.5810, 0.5667, 0.5571, 0.5429, 0.5286, 0.5143, 0.5000, 0.4857, 0.4714, 0.4571, 0.4429, 0.4286, 0.4190, 0.4048, 0.3905, 0.3810, 0.3667, 0.3524, 0.3429, 0.3333, 0.3190, 0.3095, 0.3000, 0.2905, 0.2810, 0.2714, 0.2619, 0.2524, 0.2429, 0.2381, 0.2286, 0.2238, 0.2143, 0.2095, 0.2048, 0.2000, 0.1952, 0.1952, 0.1905, 0.1905, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1905, 0.1905, 0.1952, 0.1952, 0.2000, 0.2048, 0.2095, 0.2143, 0.2238, 0.2286, 0.2381, 0.2429, 0.2524, 0.2619, 0.2714, 0.2810, 0.2905, 0.3000, 0.3095, 0.3190, 0.3333, 0.3429, 0.3524, 0.3667, 0.3810, 0.3905, 0.4048, 0.4190, 0.4286, 0.4429, 0.4571, 0.4714, 0.4857, 0.5000, 0.5143, 0.5286, 0.5429, 0.5571, 0.5667, 0.5810, 0.5952, 0.6095, 0.6238, 0.6381, 0.6524, 0.6667, 0.6762, 0.6905, 0.7048, 0.7143, 0.7286, 0.7381, 0.7524, 0.7619, 0.7714, 0.7857, 0.7952, 0.8048, 0.8143, 0.8190, 0.8286, 0.8381, 0.8476, 0.8524, 0.8571, 0.8667, 0.8714, 0.8762, 0.8810, 0.8857, 0.8905, 0.8905, 0.8952, 0.8952, 0.8952, 0.9000, 0.9000, 0.9000, 0.8952, 0.8952, 0.8952, 0.8905, 0.8905, 0.8857, 0.8810, 0.8762, 0.8714, 0.8667, 0.8571, 0.8524, 0.8476, 0.8381, 0.8286, 0.8190, 0.8143, 0.8048, 0.7952, 0.7857, 0.7714, 0.7619, 0.7524, 0.7381, 0.7286, 0.7143, 0.7048, 0.6905, 0.6762, 0.6667, 0.6524, 0.6381, 0.6238, 0.6095, 0.5952, 0.5810, 0.5667, 0.5571, 0.5429, 0.5286, 0.5143, 0.5000, 0.4857, 0.4714, 0.4571, 0.4429, 0.4286, 0.4190, 0.4048, 0.3905, 0.3810, 0.3667, 0.3524, 0.3429, 0.3333, 0.3190, 0.3095, 0.3000, 0.2905, 0.2810, 0.2714, 0.2619, 0.2524, 0.2429, 0.2381, 0.2286, 0.2238, 0.2143, 0.2095, 0.2048, 0.2000, 0.1952, 0.1952, 0.1905, 0.1905, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1905, 0.1905, 0.1952, 0.1952, 0.2000, 0.2048, 0.2095, 0.2143, 0.2238, 0.2286, 0.2381, 0.2429, 0.2524, 0.2619, 0.2714, 0.2810, 0.2905, 0.3000, 0.3095, 0.3190, 0.3333, 0.3429, 0.3524, 0.3667, 0.3810, 0.3905, 0.4048, 0.4190, 0.4286, 0.4429, 0.4571, 0.4714, 0.4857, 0.5000, 0.5143, 0.5286, 0.5429, 0.5571, 0.5667, 0.5810, 0.5952, 0.6095, 0.6238, 0.6381, 0.6524, 0.6667, 0.6762, 0.6905, 0.7048, 0.7143, 0.7286, 0.7381, 0.7524, 0.7619, 0.7714, 0.7857, 0.7952, 0.8048, 0.8143, 0.8190, 0.8286, 0.8381, 0.8476, 0.8524, 0.8571, 0.8667, 0.8714, 0.8762, 0.8810, 0.8857, 0.8905, 0.8905, 0.8952, 0.8952, 0.8952, 0.9000, 0.9000, 0.9000, 0.8952, 0.8952, 0.8952, 0.8905, 0.8905, 0.8857, 0.8810, 0.8762, 0.8714, 0.8667, 0.8571, 0.8524, 0.8476, 0.8381, 0.8286, 0.8190, 0.8143, 0.8048, 0.7952, 0.7857, 0.7714, 0.7619, 0.7524, 0.7381, 0.7286, 0.7143, 0.7048, 0.6905, 0.6762, 0.6667, 0.6524, 0.6381, 0.6238, 0.6095, 0.5952, 0.5810, 0.5667, 0.5571, 0.5429, 0.5286, 0.5143, 0.5000, 0.4857, 0.4714, 0.4571, 0.4429, 0.4286, 0.4190, 0.4048, 0.3905, 0.3810, 0.3667, 0.3524, 0.3429, 0.3333, 0.3190, 0.3095, 0.3000, 0.2905, 0.2810, 0.2714, 0.2619, 0.2524, 0.2429, 0.2381, 0.2286, 0.2238, 0.2143, 0.2095, 0.2048, 0.2000, 0.1952, 0.1952, 0.1905, 0.1905, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1905, 0.1905, 0.1952, 0.1952, 0.2000, 0.2048, 0.2095, 0.2143, 0.2238, 0.2286, 0.2381, 0.2429, 0.2524, 0.2619, 0.2714, 0.2810, 0.2905, 0.3000, 0.3095, 0.3190, 0.3333, 0.3429, 0.3524, 0.3667, 0.3810, 0.3905, 0.4048, 0.4190, 0.4286, 0.4429, 0.4571, 0.4714, 0.4857, 0.5000, 0.5143, 0.5286, 0.5429, 0.5571, 0.5667, 0.5810, 0.5952, 0.6095, 0.6238, 0.6381, 0.6524, 0.6667, 0.6762, 0.6905, 0.7048, 0.7143, 0.7286, 0.7381, 0.7524, 0.7619, 0.7714, 0.7857, 0.7952, 0.8048, 0.8143, 0.8190, 0.8286, 0.8381, 0.8476, 0.8524, 0.8571, 0.8667, 0.8714, 0.8762, 0.8810, 0.8857, 0.8905, 0.8905, 0.8952, 0.8952, 0.8952, 0.9000, 0.9000, 0.9000, 0.8952, 0.8952, 0.8952, 0.8905, 0.8905, 0.8857, 0.8810, 0.8762, 0.8714, 0.8667, 0.8571, 0.8524, 0.8476, 0.8381, 0.8286, 0.8190, 0.8143, 0.8048, 0.7952, 0.7857, 0.7714, 0.7619, 0.7524, 0.7381, 0.7286, 0.7143, 0.7048, 0.6905, 0.6762, 0.6667, 0.6524, 0.6381, 0.6238, 0.6095, 0.5952, 0.5810, 0.5667, 0.5571, 0.5429, 0.5286, 0.5143, 0.5000, 0.4857, 0.4714, 0.4571, 0.4429, 0.4286, 0.4190, 0.4048, 0.3905, 0.3810, 0.3667, 0.3524, 0.3429, 0.3333, 0.3190, 0.3095, 0.3000, 0.2905, 0.2810, 0.2714, 0.2619, 0.2524, 0.2429, 0.2381, 0.2286, 0.2238, 0.2143, 0.2095, 0.2048, 0.2000, 0.1952, 0.1952, 0.1905, 0.1905, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1905, 0.1905, 0.1952, 0.1952, 0.2000, 0.2048, 0.2095, 0.2143, 0.2238, 0.2286, 0.2381, 0.2429, 0.2524, 0.2619, 0.2714, 0.2810, 0.2905, 0.3000, 0.3095, 0.3190, 0.3333, 0.3429, 0.3524, 0.3667, 0.3810, 0.3905, 0.4048, 0.4190, 0.4286, 0.4429, 0.4571, 0.4714, 0.4857, 0.5000, 0.5143, 0.5286, 0.5429, 0.5571, 0.5667, 0.5810, 0.5952, 0.6095, 0.6238, 0.6381, 0.6524, 0.6667, 0.6762, 0.6905, 0.7048, 0.7143, 0.7286, 0.7381, 0.7524, 0.7619, 0.7714, 0.7857, 0.7952, 0.8048, 0.8143, 0.8190, 0.8286, 0.8381, 0.8476, 0.8524, 0.8571, 0.8667, 0.8714, 0.8762, 0.8810, 0.8857, 0.8905, 0.8905, 0.8952, 0.8952, 0.8952, 0.9000, 0.9000, 0.9000, 0.8952, 0.8952, 0.8952, 0.8905, 0.8905, 0.8857, 0.8810, 0.8762, 0.8714, 0.8667, 0.8571, 0.8524, 0.8476, 0.8381, 0.8286, 0.8190, 0.8143, 0.8048, 0.7952, 0.7857, 0.7714, 0.7619, 0.7524, 0.7381, 0.7286, 0.7143, 0.7048, 0.6905, 0.6762, 0.6667, 0.6524, 0.6381, 0.6238, 0.6095, 0.5952, 0.5810, 0.5667, 0.5571, 0.5429, 0.5286, 0.5143, 0.5000, 0.4857, 0.4714, 0.4571, 0.4429, 0.4286, 0.4190, 0.4048, 0.3905, 0.3810, 0.3667, 0.3524, 0.3429, 0.3333, 0.3190, 0.3095, 0.3000, 0.2905, 0.2810, 0.2714, 0.2619, 0.2524, 0.2429, 0.2381, 0.2286, 0.2238, 0.2143, 0.2095, 0.2048, 0.2000, 0.1952, 0.1952, 0.1905, 0.1905, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1905, 0.1905, 0.1952, 0.1952, 0.2000, 0.2048, 0.2095, 0.2143, 0.2238, 0.2286, 0.2381, 0.2429, 0.2524, 0.2619, 0.2714, 0.2810, 0.2905, 0.3000, 0.3095, 0.3190, 0.3333, 0.3429, 0.3524, 0.3667, 0.3810, 0.3905, 0.4048, 0.4190, 0.4286, 0.4429, 0.4571, 0.4714, 0.4857, 0.5000, 0.5143, 0.5286, 0.5429, 0.5571, 0.5667, 0.5810, 0.5952, 0.6095, 0.6238, 0.6381, 0.6524, 0.6667, 0.6762, 0.6905, 0.7048, 0.7143, 0.7286, 0.7381, 0.7524, 0.7619, 0.7714, 0.7857, 0.7952, 0.8048, 0.8143, 0.8190, 0.8286, 0.8381, 0.8476, 0.8524, 0.8571, 0.8667, 0.8714, 0.8762, 0.8810, 0.8857, 0.8905, 0.8905, 0.8952, 0.8952, 0.8952, 0.9000, 0.9000, 0.9000, 0.8952, 0.8952, 0.8952, 0.8905, 0.8905, 0.8857, 0.8810, 0.8762, 0.8714, 0.8667, 0.8571, 0.8524, 0.8476, 0.8381, 0.8286, 0.8190, 0.8143, 0.8048, 0.7952, 0.7857, 0.7714, 0.7619, 0.7524, 0.7381, 0.7286, 0.7143, 0.7048, 0.6905, 0.6762, 0.6667, 0.6524, 0.6381, 0.6238, 0.6095, 0.5952, 0.5810, 0.5667, 0.5571, 0.5429, 0.5286, 0.5143, 0.5000, 0.4857, 0.4714, 0.4571, 0.4429, 0.4286, 0.4190, 0.4048, 0.3905, 0.3810, 0.3667, 0.3524, 0.3429, 0.3333, 0.3190, 0.3095, 0.3000, 0.2905, 0.2810, 0.2714, 0.2619, 0.2524, 0.2429, 0.2381, 0.2286, 0.2238, 0.2143, 0.2095, 0.2048, 0.2000, 0.1952, 0.1952, 0.1905, 0.1905, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1905, 0.1905, 0.1952, 0.1952, 0.2000, 0.2048, 0.2095, 0.2143, 0.2238, 0.2286, 0.2381, 0.2429, 0.2524, 0.2619, 0.2714, 0.2810, 0.2905, 0.3000, 0.3095, 0.3190, 0.3333, 0.3429, 0.3524, 0.3667, 0.3810, 0.3905, 0.4048, 0.4190, 0.4286, 0.4429, 0.4571, 0.4714, 0.4857, 0.5000, 0.5143, 0.5286, 0.5429, 0.5571, 0.5667, 0.5810, 0.5952, 0.6095, 0.6238, 0.6381, 0.6524, 0.6667, 0.6762, 0.6905, 0.7048, 0.7143, 0.7286, 0.7381, 0.7524, 0.7619, 0.7714, 0.7857, 0.7952, 0.8048, 0.8143, 0.8190, 0.8286, 0.8381, 0.8476, 0.8524, 0.8571, 0.8667, 0.8714, 0.8762, 0.8810, 0.8857, 0.8905, 0.8905, 0.8952, 0.8952, 0.8952, 0.9000, 0.9000, 0.9000, 0.8952, 0.8952, 0.8952, 0.8905, 0.8905, 0.8857, 0.8810, 0.8762, 0.8714, 0.8667, 0.8571, 0.8524, 0.8476, 0.8381, 0.8286, 0.8190, 0.8143, 0.8048, 0.7952, 0.7857, 0.7714, 0.7619, 0.7524, 0.7381, 0.7286, 0.7143, 0.7048, 0.6905, 0.6762, 0.6667, 0.6524, 0.6381, 0.6238, 0.6095, 0.5952, 0.5810, 0.5667, 0.5571, 0.5429, 0.5286, 0.5143, 0.5000, 0.4857, 0.4714, 0.4571, 0.4429, 0.4286, 0.4190, 0.4048, 0.3905, 0.3810, 0.3667, 0.3524, 0.3429, 0.3333, 0.3190, 0.3095, 0.3000, 0.2905, 0.2810, 0.2714, 0.2619, 0.2524, 0.2429, 0.2381, 0.2286, 0.2238, 0.2143, 0.2095, 0.2048, 0.2000, 0.1952, 0.1952, 0.1905, 0.1905, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1905, 0.1905, 0.1952, 0.1952, 0.2000, 0.2048, 0.2095, 0.2143, 0.2238, 0.2286, 0.2381, 0.2429, 0.2524, 0.2619, 0.2714, 0.2810, 0.2905, 0.3000, 0.3095, 0.3190, 0.3333, 0.3429, 0.3524, 0.3667, 0.3810, 0.3905, 0.4048, 0.4190, 0.4286, 0.4429, 0.4571, 0.4714, 0.4857, 0.5000, 0.5143, 0.5286, 0.5429, 0.5571, 0.5667, 0.5810, 0.5952, 0.6095, 0.6238, 0.6381, 0.6524, 0.6667, 0.6762, 0.6905, 0.7048, 0.7143, 0.7286, 0.7381, 0.7524, 0.7619, 0.7714, 0.7857, 0.7952, 0.8048, 0.8143, 0.8190, 0.8286, 0.8381, 0.8476, 0.8524, 0.8571, 0.8667, 0.8714, 0.8762, 0.8810, 0.8857, 0.8905, 0.8905, 0.8952, 0.8952, 0.8952, 0.9000, 0.9000, 0.9000, 0.8952, 0.8952, 0.8952, 0.8905, 0.8905, 0.8857, 0.8810, 0.8762, 0.8714, 0.8667, 0.8571, 0.8524, 0.8476, 0.8381, 0.8286, 0.8190, 0.8143, 0.8048, 0.7952, 0.7857, 0.7714, 0.7619, 0.7524, 0.7381, 0.7286, 0.7143, 0.7048, 0.6905, 0.6762, 0.6667, 0.6524, 0.6381, 0.6238, 0.6095, 0.5952, 0.5810, 0.5667, 0.5571, 0.5429, 0.5286, 0.5143, 0.5000, 0.4857, 0.4714, 0.4571, 0.4429, 0.4286, 0.4190, 0.4048, 0.3905, 0.3810, 0.3667, 0.3524, 0.3429, 0.3333, 0.3190, 0.3095, 0.3000, 0.2905, 0.2810, 0.2714, 0.2619, 0.2524, 0.2429, 0.2381, 0.2286, 0.2238, 0.2143, 0.2095, 0.2048, 0.2000, 0.1952, 0.1952, 0.1905, 0.1905, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1857, 0.1905, 0.1905, 0.1952, 0.1952, 0.2000, 0.2048, 0.2095, 0.2143, 0.2238, 0.2286, 0.2381, 0.2429, 0.2524, 0.2619, 0.2714, 0.2810, 0.2905, 0.3000, 0.3095, 0.3190, 0.3333, 0.3429, 0.3524, 0.3667, 0.3810, 0.3905, 0.4048, 0.4190, 0.4286, 0.4429, 0.4571, 0.4714, 0.4857, 0.5000, 0.5143, 0.5286]
20 changes: 20 additions & 0 deletions spft/testing/output/xxx_100_Test_Right_Only_out-file.yml
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions spft/testing/output/xxx_100hz_2_Test_Right_Only_out-file.yml
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions spft/testing/output/xxx_60Hz_Test_Right_Only_out-file.yml
View file
Open in desktop

Large diffs are not rendered by default.

20 changes: 20 additions & 0 deletions spft/testing/output/xxx_60_Test_Right_Only_out-file.yml
View file
Open in desktop

Large diffs are not rendered by default.

12 changes: 6 additions & 6 deletions spft/testing/output/xxx_Test_Right_Only_out-file.yml
View file
Open in desktop

Large diffs are not rendered by default.

7 changes: 4 additions & 3 deletions src/main/java/com/github/neuralabc/spft/task/Trial.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,9 +45,10 @@ public Trial(TrialConfig config, Map<String, SequenceConfig> sequencesPool) {

public void run(ExperimentFrame.Binding binding, Path outputFile) throws InterruptedException, IOException {
LOG.info("\t\tStarting trial '{}'", config.getName());

int delay = 1000 / sequence.getFrequency();

LOG.info("\t\tFrequency: '{}' Hz", sequence.getFrequency());
LOG.info("\t\tExpected | Actual Delay: '{} | {}' ms", 1000f/sequence.getFrequency(),Math.round(1000f/sequence.getFrequency()));

int delay = Math.round(1000f / sequence.getFrequency());
Presentation presentation = new Presentation(binding);
Timer timer = new Timer(delay, presentation);
timer.setInitialDelay(0);
Expand Down