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
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
bioroboticslab
robofish
io
Commits
81d38a3d
Commit
81d38a3d
authored
4 years ago
by
Andi Gerken
Browse files
Options
Downloads
Patches
Plain Diff
Updated deprecation warning version numbers
Fixed gen_docs.sh
parent
d3f194f9
No related branches found
No related tags found
1 merge request
!17
Updated docs
Pipeline
#38486
passed
4 years ago
Stage: package
Stage: test
Changes
4
Pipelines
1
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
gen_docs.sh
+2
-2
2 additions, 2 deletions
gen_docs.sh
src/robofish/io/entity.py
+6
-6
6 additions, 6 deletions
src/robofish/io/entity.py
src/robofish/io/file.py
+6
-6
6 additions, 6 deletions
src/robofish/io/file.py
tests/robofish/io/test_entity.py
+2
-1
2 additions, 1 deletion
tests/robofish/io/test_entity.py
with
16 additions
and
15 deletions
gen_docs.sh
+
2
−
2
View file @
81d38a3d
cd
"
${
0
%/*
}
"
cd
"
${
0
%/*
}
"
pdoc3
--html
fish_models
--force
pdoc3
--html
robofish.io
--force
cp
-r
docs/img/ html/
fish_models/
cp
-r
docs/img/ html/
robofish/io
This diff is collapsed.
Click to expand it.
src/robofish/io/entity.py
+
6
−
6
View file @
81d38a3d
...
@@ -151,8 +151,8 @@ class Entity(h5py.Group):
...
@@ -151,8 +151,8 @@ class Entity(h5py.Group):
@property
@property
@deprecation.deprecated
(
@deprecation.deprecated
(
deprecated_in
=
"
1
.2
"
,
deprecated_in
=
"
0
.2
"
,
removed_in
=
"
1
.2.4
"
,
removed_in
=
"
0
.2.4
"
,
details
=
"
We found that our calculation of
'
poses_calc_ori_rad
'
is flawed and replaced it
"
details
=
"
We found that our calculation of
'
poses_calc_ori_rad
'
is flawed and replaced it
"
"
Use the original poses (
'
poses_rad
'
) with tracked orientations instead.
"
"
Use the original poses (
'
poses_rad
'
) with tracked orientations instead.
"
"
If you see this message and you don
'
t know what to do, update all packages,
"
"
If you see this message and you don
'
t know what to do, update all packages,
"
...
@@ -172,8 +172,8 @@ class Entity(h5py.Group):
...
@@ -172,8 +172,8 @@ class Entity(h5py.Group):
@property
@property
@deprecation.deprecated
(
@deprecation.deprecated
(
deprecated_in
=
"
1
.2
"
,
deprecated_in
=
"
0
.2
"
,
removed_in
=
"
1
.2.4
"
,
removed_in
=
"
0
.2.4
"
,
details
=
"
We found that our calculation of
'
poses_calc_ori
'
is flawed and replaced it
"
details
=
"
We found that our calculation of
'
poses_calc_ori
'
is flawed and replaced it
"
"
Use the original poses (
'
poses
'
) with tracked orientations instead.
"
"
Use the original poses (
'
poses
'
) with tracked orientations instead.
"
"
If you see this message and you don
'
t know what to do, update all packages,
"
"
If you see this message and you don
'
t know what to do, update all packages,
"
...
@@ -206,8 +206,8 @@ class Entity(h5py.Group):
...
@@ -206,8 +206,8 @@ class Entity(h5py.Group):
@property
@property
@deprecation.deprecated
(
@deprecation.deprecated
(
deprecated_in
=
"
1
.2
"
,
deprecated_in
=
"
0
.2
"
,
removed_in
=
"
1
.2.4
"
,
removed_in
=
"
0
.2.4
"
,
details
=
"
We found that our calculation of
'
speed_turn
'
is flawed and replaced it
"
details
=
"
We found that our calculation of
'
speed_turn
'
is flawed and replaced it
"
"
with
'
actions_speeds_turns
'
. The difference in calculation is, that the tracked
"
"
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.
"
"
orientation is used now which gives the fish the ability to swim backwards.
"
...
...
This diff is collapsed.
Click to expand it.
src/robofish/io/file.py
+
6
−
6
View file @
81d38a3d
...
@@ -424,8 +424,8 @@ class File(h5py.File):
...
@@ -424,8 +424,8 @@ class File(h5py.File):
@property
@property
@deprecation.deprecated
(
@deprecation.deprecated
(
deprecated_in
=
"
1
.2
"
,
deprecated_in
=
"
0
.2
"
,
removed_in
=
"
1
.2.4
"
,
removed_in
=
"
0
.2.4
"
,
details
=
"
We found that our calculation of
'
poses_calc_ori
'
is flawed.
"
details
=
"
We found that our calculation of
'
poses_calc_ori
'
is flawed.
"
"
Please replace it with
'
poses
'
and use the tracked orientation.
"
"
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 and if nothing helps, contact Andi.
\n
"
"
If you see this message and you don
'
t know what to do, update all packages and if nothing helps, contact Andi.
\n
"
...
@@ -436,8 +436,8 @@ class File(h5py.File):
...
@@ -436,8 +436,8 @@ class File(h5py.File):
@property
@property
@deprecation.deprecated
(
@deprecation.deprecated
(
deprecated_in
=
"
1
.2
"
,
deprecated_in
=
"
0
.2
"
,
removed_in
=
"
1
.2.4
"
,
removed_in
=
"
0
.2.4
"
,
details
=
"
We found that our calculation of
'
poses_calc_ori_rad
'
is flawed.
"
details
=
"
We found that our calculation of
'
poses_calc_ori_rad
'
is flawed.
"
"
Please replace it with
'
poses_rad
'
and use the tracked orientation.
"
"
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 and if nothing helps, contact Andi.
\n
"
"
If you see this message and you don
'
t know what to do, update all packages and if nothing helps, contact Andi.
\n
"
...
@@ -450,8 +450,8 @@ class File(h5py.File):
...
@@ -450,8 +450,8 @@ class File(h5py.File):
@property
@property
@deprecation.deprecated
(
@deprecation.deprecated
(
deprecated_in
=
"
1
.2
"
,
deprecated_in
=
"
0
.2
"
,
removed_in
=
"
1
.2.4
"
,
removed_in
=
"
0
.2.4
"
,
details
=
"
We found that our calculation of
'
speed_turn
'
is flawed and replaced it
"
details
=
"
We found that our calculation of
'
speed_turn
'
is flawed and replaced it
"
"
with
'
actions_speeds_turns
'
. The difference in calculation is, that the tracked
"
"
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.
"
"
orientation is used now which gives the fish the ability to swim backwards.
"
...
...
This diff is collapsed.
Click to expand it.
tests/robofish/io/test_entity.py
+
2
−
1
View file @
81d38a3d
...
@@ -36,7 +36,8 @@ def test_entity_turns_speeds():
...
@@ -36,7 +36,8 @@ def test_entity_turns_speeds():
There were issues with 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.
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.
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
There is an open issue, to check this test again: https://git.imp.fu-berlin.de/bioroboticslab/robofish/io/-/issues/14
"""
"""
f
=
robofish
.
io
.
File
(
world_size_cm
=
[
100
,
100
],
frequency_hz
=
25
)
f
=
robofish
.
io
.
File
(
world_size_cm
=
[
100
,
100
],
frequency_hz
=
25
)
...
...
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