Skip to content
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

Jump to bottom

Fixed custom_plot #767

Merged
merged 1 commit into from
Sep 27, 2023
Merged

Fixed custom_plot #767

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 4 additions & 4 deletions bioptim/examples/getting_started/custom_plotting.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -92,18 +92,18 @@ def prepare_ocp(
)

# Add my lovely new plot
ocp.add_plot("My New Extra Plot", lambda t, x, u, p: custom_plot_callback(x, [0, 1, 3]), plot_type=PlotType.PLOT)
ocp.add_plot("My New Extra Plot", lambda t, x, u, p, s: custom_plot_callback(x, [0, 1, 3]), plot_type=PlotType.PLOT)
ocp.add_plot( # This one combines to the previous one as they have the same name
"My New Extra Plot",
lambda t, x, u, p: custom_plot_callback(x, [1, 3]),
lambda t, x, u, p, s: custom_plot_callback(x, [1, 3]),
plot_type=PlotType.STEP,
axes_idx=[1, 2],
)
ocp.add_plot(
"My Second New Extra Plot",
lambda t, x, u, p: custom_plot_callback(x, [1, 3]),
lambda t, x, u, p, s: custom_plot_callback(x, [2, 1]),
plot_type=PlotType.INTEGRATED,
axes_idx=[1, 2],
axes_idx=[0, 2],
)

return ocp
Expand Down
17 changes: 12 additions & 5 deletions bioptim/gui/plot.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -385,7 +385,7 @@
)
nlp.plot[key].phase_mappings = BiMapping(to_first=range(size), to_second=range(size))
else:
size = len(nlp.plot[key].phase_mappings.to_second.map_idx)
size = max(nlp.plot[key].phase_mappings.to_second.map_idx) + 1
if key not in variable_sizes[i]:
variable_sizes[i][key] = size
else:
Expand Down Expand Up @@ -432,7 +432,7 @@
continue

mapping_to_first_index = nlp.plot[variable].phase_mappings.to_first.map_idx
mapping_range_index = list(range(len(nlp.plot[variable].phase_mappings.to_second.map_idx)))
mapping_range_index = list(range(max(nlp.plot[variable].phase_mappings.to_second.map_idx) + 1))
for ctr in mapping_range_index:
ax = axes[ctr]
if ctr in mapping_to_first_index:
Expand Down Expand Up @@ -804,10 +804,13 @@
y_tp[:, :] = val
all_y.append(y_tp)

for idx in range(len(self.plot_func[key][i].phase_mappings.to_second.map_idx)):
for idx in range(max(self.plot_func[key][i].phase_mappings.to_second.map_idx) + 1):
y_tp = []
for y in all_y:
y_tp.append(y[idx, :])
if idx in self.plot_func[key][i].phase_mappings.to_second.map_idx:
for y in all_y:
y_tp.append(y[idx, :])
else:
y_tp = None

Check warning on line 813 in bioptim/gui/plot.py

View check run for this annotation

Codecov / codecov/patch

bioptim/gui/plot.py#L813 

Added line #L813 was not covered by tests
self.__append_to_ydata([y_tp])

elif self.plot_func[key][i].type == PlotType.POINT:
Expand Down Expand Up @@ -1057,9 +1060,13 @@
"""
Update the plotted data from ydata
"""

assert len(self.plots) == len(self.ydata)
for i, plot in enumerate(self.plots):
y = self.ydata[i]
if y is None:
# Jump the plots which are empty
y = (np.nan,) * len(plot[2])

Check warning on line 1069 in bioptim/gui/plot.py

View check run for this annotation

Codecov / codecov/patch

bioptim/gui/plot.py#L1069 

Added line #L1069 was not covered by tests

if plot[0] == PlotType.INTEGRATED:
for cmp, p in enumerate(plot[2]):
Expand Down