Mentions légales du service
Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
M
Motor_Controller
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Admin message
GitLab upgrade completed. Current version is 17.11.3.
Show more breadcrumbs
Spring
WP6_Robot_Behavior
Motor_Controller
Commits
1a83fa7f
Commit
1a83fa7f
authored
4 years ago
by
AUTERNAUD Alex
Browse files
Options
Downloads
Patches
Plain Diff
plot option in run_demo
parent
e458db07
No related branches found
No related tags found
No related merge requests found
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
demo.py
+1
-1
1 addition, 1 deletion
demo.py
notes.txt
+2
-4
2 additions, 4 deletions
notes.txt
run_demo.sh
+11
-0
11 additions, 0 deletions
run_demo.sh
social_mpc/config/settings_ssr.conf
+4
-4
4 additions, 4 deletions
social_mpc/config/settings_ssr.conf
with
18 additions
and
9 deletions
demo.py
+
1
−
1
View file @
1a83fa7f
...
@@ -59,7 +59,7 @@ def demo():
...
@@ -59,7 +59,7 @@ def demo():
state
,
_
,
_
,
info
=
env
.
step
([
0.
,
0.
,
0.
])
state
,
_
,
_
,
info
=
env
.
step
([
0.
,
0.
,
0.
])
controller
.
step
(
state
)
controller
.
step
(
state
)
plot_render
=
run_demo_config
.
plot_render
and
GUI
plot_render
=
run_demo_config
.
plot_render
and
GUI
and
PLOT
max_steps
=
run_demo_config
.
max_steps
max_steps
=
run_demo_config
.
max_steps
if
plot_render
:
if
plot_render
:
...
...
This diff is collapsed.
Click to expand it.
notes.txt
+
2
−
4
View file @
1a83fa7f
...
@@ -6,14 +6,12 @@
...
@@ -6,14 +6,12 @@
humans_visible have not a fixed length
humans_visible have not a fixed length
- if human_target_id/pan_target_id too far away if not visible (use
- if human_target_id/pan_target_id too far away if not visible (use
set_target_pose and go back if visible) ?
set_target_pose and go back if visible) ?
- in update_goals if target (for goto_target, human_features, pan_target) <
threshold, set flag in *****_goal to activate the angle_loss
- can't pass arguments with <class string> to jax, so need to know the link
- can't pass arguments with <class string> to jax, so need to know the link
between weights index and the loss
between weights index and the loss
- same for loss_coef, loss_rad
and active_angle_loss
- same for loss_coef, loss_rad
- state of mpc, only pan angle value ?
- state of mpc, only pan angle value ?
- arg "loss" like weights, should we implement several testing/training losses
- arg "loss" like weights, should we implement several testing/training losses
- What about plots.py
- What about plots.py
- Setup: cmdclass args/options does not exist in setup.cfg => in setup.py to
- Setup: cmdclass args/options does not exist in setup.cfg => in setup.py to
execute the "make" command
execute the "make" command
- time.sleep(1.0) in goal.py and path.py
- time.sleep(1.0) in goal.py and path.py
=> path_loop_time and goal_loop_time
This diff is collapsed.
Click to expand it.
run_demo.sh
+
11
−
0
View file @
1a83fa7f
...
@@ -13,6 +13,10 @@ case $i in
...
@@ -13,6 +13,10 @@ case $i in
GUI
=
False
GUI
=
False
# by default true
# by default true
;;
;;
-p
|
--plot
)
PLOT
=
False
# true by default
;;
-n
=
*
|
--config-name
=
*
)
-n
=
*
|
--config-name
=
*
)
CONFIG_NAME
=
"
${
i
#*=
}
"
CONFIG_NAME
=
"
${
i
#*=
}
"
;;
;;
...
@@ -74,6 +78,11 @@ then
...
@@ -74,6 +78,11 @@ then
RECORDING
=
False
RECORDING
=
False
fi
fi
if
[
-z
$PLOT
]
then
PLOT
=
True
fi
DIR
=
"
$(
cd
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
"
&> /dev/null
&&
pwd
)
"
DIR
=
"
$(
cd
"
$(
dirname
"
${
BASH_SOURCE
[0]
}
"
)
"
&> /dev/null
&&
pwd
)
"
python_file
=
$DIR
/bash_args.py
python_file
=
$DIR
/bash_args.py
...
@@ -84,6 +93,7 @@ echo SAVE=$SAVE
...
@@ -84,6 +93,7 @@ echo SAVE=$SAVE
echo
VERBOSE
=
$VERBOSE
echo
VERBOSE
=
$VERBOSE
echo
GUI
=
$GUI
echo
GUI
=
$GUI
echo
RECORDING
=
$RECORDING
echo
RECORDING
=
$RECORDING
echo
PLOT
=
$PLOT
module1
=
sim2d
module1
=
sim2d
module2
=
social_mpc
module2
=
social_mpc
...
@@ -124,6 +134,7 @@ SAVE = $SAVE
...
@@ -124,6 +134,7 @@ SAVE = $SAVE
VERBOSE =
$VERBOSE
VERBOSE =
$VERBOSE
GUI =
$GUI
GUI =
$GUI
RECORDING=
$RECORDING
RECORDING=
$RECORDING
PLOT =
$PLOT
END_SCRIPT
END_SCRIPT
# modifying settings to run SimpleScreenRecorder
# modifying settings to run SimpleScreenRecorder
...
...
This diff is collapsed.
Click to expand it.
social_mpc/config/settings_ssr.conf
+
4
−
4
View file @
1a83fa7f
...
@@ -19,14 +19,14 @@ video_area=fixed
...
@@ -19,14 +19,14 @@ video_area=fixed
video_area_follow_fullscreen
=
false
video_area_follow_fullscreen
=
false
video_area_screen
=
0
video_area_screen
=
0
video_frame_rate
=
30
video_frame_rate
=
30
video_h
=
1
000
video_h
=
1
556
video_record_cursor
=
true
video_record_cursor
=
true
video_scale
=
false
video_scale
=
false
video_scaled_h
=
480
video_scaled_h
=
480
video_scaled_w
=
854
video_scaled_w
=
854
video_v4l2_device
=/
dev
/
video0
video_v4l2_device
=/
dev
/
video0
video_w
=
2
394
video_w
=
2
400
video_x
=
144
6
video_x
=
144
0
video_y
=
216
video_y
=
216
[
output
]
[
output
]
...
@@ -37,7 +37,7 @@ audio_kbit_rate=128
...
@@ -37,7 +37,7 @@ audio_kbit_rate=128
audio_options
=
audio_options
=
container
=
mp4
container
=
mp4
container_av
=
3
g2
container_av
=
3
g2
file
=/
local_scratch
/
aauterna
/
Documents
/
Work
/
projects
/
non
-
holo
-
mpc
/
results
/
data
/
videos
/
06
_
05
_
2021
_
1
6
_
55
.
mp4
file
=/
local_scratch
/
aauterna
/
Documents
/
Work
/
projects
/
non
-
holo
-
mpc
/
results
/
data
/
videos
/
17
_
05
_
2021
_
1
5
_
10
.
mp4
profile
=
profile
=
separate_files
=
false
separate_files
=
false
video_allow_frame_skipping
=
true
video_allow_frame_skipping
=
true
...
...
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