Skip to content

Commit 335581a

Browse files
committed
raibert fixes
1 parent 6ec4a29 commit 335581a

File tree

7 files changed

+16
-12
lines changed

7 files changed

+16
-12
lines changed

examples/generate_examples.jl

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,15 @@
11
################################################################################
22
# Dynamics and simulation generation
33
################################################################################
4+
using Pkg
5+
dir = joinpath(dirname(pathof(ContactImplicitMPC)), "..")
6+
Pkg.activate(dir)
7+
include(joinpath(dir, "src/code_gen_loader.jl"))
8+
49
# Generate dynamics
5-
dynamicsdir = joinpath(@__DIR__, "..", "src", "dynamics")
10+
dynamicsdir = joinpath(dir, "src", "dynamics")
611
include(joinpath(dynamicsdir, "generate_dynamics.jl"))
712

813
# Generate simulation
9-
simulationdir = joinpath(@__DIR__, "..", "src", "simulation")
10-
include(joinpath(simulationdir, "generate_simulation.jl"))
14+
simulationdir = joinpath(dir, "src", "simulation")
15+
include(joinpath(simulationdir, "generate_simulation.jl"))

examples/hopper/flat.jl

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -74,7 +74,6 @@ ContactImplicitMPC.render(vis)
7474

7575
# ## Visualize
7676
anim = visualize_robot!(vis, model, sim.traj, sample=5);
77-
anim = visualize_force!(vis, model, env, sim.traj, anim=anim, h=h_sim, sample = 5);
7877

7978
# ## Timing result
8079
# Julia is [JIT-ed](https://en.wikipedia.org/wiki/Just-in-time_compilation) so re-run the MPC setup through Simulate for correct timing results.

examples/raibert/flat_raibert.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,4 +57,4 @@ vis = ContactImplicitMPC.Visualizer()
5757
ContactImplicitMPC.render(vis)
5858

5959
# ## Visualize
60-
anim = visualize_robot!(vis, model, sim.traj, sample=5)
60+
anim = visualize_robot!(vis, model, sim.traj, sample=5);

examples/raibert/flat_raibert_3D.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,5 +65,5 @@ vis = ContactImplicitMPC.Visualizer()
6565
ContactImplicitMPC.render(vis)
6666

6767
# ## Visualize
68-
ContactImplicitMPC.plot_surface!(vis, s.env, n=200, xlims = [-1, 40])
69-
visualize_robot!(vis, model_sim, sim.traj, sample=20)
68+
ContactImplicitMPC.plot_surface!(vis, s.env, n=200, xlims = [-1, 40]);
69+
visualize_robot!(vis, model_sim, sim.traj, sample=20);

examples/raibert/piecewise_raibert.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ vis = ContactImplicitMPC.Visualizer()
5858
ContactImplicitMPC.render(vis)
5959

6060
# ## Visualize
61-
ContactImplicitMPC.plot_surface!(vis, s.env, n=200, xlims = [-1, 40])
62-
anim = visualize_robot!(vis, model, sim.traj, sample=5)
61+
ContactImplicitMPC.plot_surface!(vis, s.env, n=200, xlims = [-1, 40]);
62+
anim = visualize_robot!(vis, model, sim.traj, sample=5);

examples/raibert/sine_raibert.jl

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ vis = ContactImplicitMPC.Visualizer()
5858
ContactImplicitMPC.render(vis)
5959

6060
# ## Visualize
61-
ContactImplicitMPC.plot_surface!(vis, s.env, n=200, xlims = [-1, 40])
62-
anim = visualize_robot!(vis, model, sim.traj, sample=5)
61+
ContactImplicitMPC.plot_surface!(vis, s.env, n=200, xlims = [-1, 40]);
62+
anim = visualize_robot!(vis, model, sim.traj, sample=5);

examples/raibert/sine_raibert_3D.jl

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,4 @@ vis = ContactImplicitMPC.Visualizer()
6262
ContactImplicitMPC.render(vis)
6363

6464
# ## Visualize
65-
visualize_robot!(vis, model_sim, sim.traj, sample=20)
65+
visualize_robot!(vis, model_sim, sim.traj, sample=20);

0 commit comments

Comments
 (0)