Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
io
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bioroboticslab
robofish
io
Commits
995beed6
Commit
995beed6
authored
Jun 16, 2021
by
Andi Gerken
Browse files
Options
Downloads
Patches
Plain Diff
Changes to resolve threads in the MR
For gitlab: this MR close issue
#8
parent
b3a86f59
No related branches found
No related tags found
1 merge request
!16
Changed the way of calculating speeds and turns (+ minor features)
Pipeline
#38388
passed
Jun 16, 2021
Stage: package
Stage: test
Changes
2
Pipelines
1
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/robofish/io/file.py
+3
-3
3 additions, 3 deletions
src/robofish/io/file.py
tests/robofish/io/test_entity.py
+1
-1
1 addition, 1 deletion
tests/robofish/io/test_entity.py
with
4 additions
and
4 deletions
src/robofish/io/file.py
+
3
−
3
View file @
995beed6
...
...
@@ -429,7 +429,7 @@ class File(h5py.File):
details
=
"
We found that our calculation of
'
poses_calc_ori
'
is flawed.
"
"
Please replace it with
'
poses
'
and use the tracked orientation.
"
"
If you see this message and you don
'
t know what to do, update all packages,
"
"
merge to the master branch of
fish_models
if nothing helps, contact Andi.
\n
"
"
merge to the master branch of
robofish.io
if nothing helps, contact Andi.
\n
"
"
Don
'
t ignore this warning, it
'
s a serious issue.
"
,
)
def
entity_poses_calc_ori
(
self
):
...
...
@@ -442,7 +442,7 @@ class File(h5py.File):
details
=
"
We found that our calculation of
'
poses_calc_ori_rad
'
is flawed.
"
"
Please replace it with
'
poses_rad
'
and use the tracked orientation.
"
"
If you see this message and you don
'
t know what to do, update all packages,
"
"
merge to the master branch of
fish_models
if nothing helps, contact Andi.
\n
"
"
merge to the master branch of
robofish.io
if nothing helps, contact Andi.
\n
"
"
Don
'
t ignore this warning, it
'
s a serious issue.
"
,
)
def
entity_poses_calc_ori_rad
(
self
):
...
...
@@ -458,7 +458,7 @@ class File(h5py.File):
"
with
'
actions_speeds_turns
'
. The difference in calculation is, that the tracked
"
"
orientation is used now which gives the fish the ability to swim backwards.
"
"
If you see this message and you don
'
t know what to do, update all packages,
"
"
merge to the master branch of
fish_models
if nothing helps, contact Andi.
\n
"
"
merge to the master branch of
robofish.io
if nothing helps, contact Andi.
\n
"
"
Don
'
t ignore this warning, it
'
s a serious issue.
"
,
)
def
entity_speeds_turns
(
self
):
...
...
This diff is collapsed.
Click to expand it.
tests/robofish/io/test_entity.py
+
1
−
1
View file @
995beed6
...
...
@@ -33,7 +33,7 @@ def test_entity_object():
def
test_entity_turns_speeds
():
"""
This test was created, when the turns and speeds where calculated from positions only.
There were issues with
t
the calculation of speeds and turns. The corresponding functions were set to be deprecated.
There were issues with the calculation of speeds and turns. The corresponding functions were set to be deprecated.
This test was adapted to have plausible orientations which are used when the speeds and turns are calculated.
The reconstructed track is not identical to the original track. The reson for this is unknown.
TODO: Find the reason, why the reconstructed track differs
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment