Skip to content

Commit 0ce3dfb

Browse files
committed
add multi experiments
1 parent 0db0a97 commit 0ce3dfb

File tree

166 files changed

+33995
-393
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

166 files changed

+33995
-393
lines changed
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.
0 Bytes
Binary file not shown.

NPField/script_d1/acados_mpc_npfield.json

Lines changed: 6 additions & 6 deletions
Large diffs are not rendered by default.

NPField/script_d1/c_generated_code/acados_solver_robot_model.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -809,7 +809,7 @@ static void robot_model_acados_create_set_opts(robot_model_solver_capsule* capsu
809809
double nlp_solver_tol_comp = 0.0001;
810810
ocp_nlp_solver_opts_set(nlp_config, nlp_opts, "tol_comp", &nlp_solver_tol_comp);
811811

812-
int nlp_solver_max_iter = 120;
812+
int nlp_solver_max_iter = 50;
813813
ocp_nlp_solver_opts_set(nlp_config, nlp_opts, "max_iter", &nlp_solver_max_iter);
814814

815815
// set options for adaptive Levenberg-Marquardt Update
@@ -1174,7 +1174,7 @@ void robot_model_acados_print_stats(robot_model_solver_capsule* capsule)
11741174
printf("stat_n_max = %d is too small, increase it in the template!\n", stat_n_max);
11751175
exit(1);
11761176
}
1177-
double stat[1936];
1177+
double stat[816];
11781178
ocp_nlp_get(capsule->nlp_solver, "statistics", stat);
11791179

11801180
int nrow = nlp_iter+1 < stat_m ? nlp_iter+1 : stat_m;
-40 Bytes
Binary file not shown.

NPField/script_d1/c_generated_code/robot_model_cost/robot_model_cost_y_0_fun.c

Lines changed: 20 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -126,14 +126,14 @@ static int casadi_f0(const casadi_real** arg, casadi_real** res, casadi_int* iw,
126126
w04 = arg[1] ? arg[1][2] : 0;
127127
/* #15: output[0][7] = @4 */
128128
if (res[0]) res[0][7] = w04;
129-
/* #16: @4 = 7.2 */
130-
w04 = 7.2000000000000002e+00;
129+
/* #16: @4 = 8.1 */
130+
w04 = 8.0999999999999996e+00;
131131
/* #17: @5 = 0 */
132132
w05 = 0.;
133133
/* #18: @3 = fmax(@3,@5) */
134134
w03 = casadi_fmax(w03,w05);
135-
/* #19: @6 = 8 */
136-
w06 = 8.;
135+
/* #19: @6 = 9 */
136+
w06 = 9.;
137137
/* #20: @3 = fmin(@3,@6) */
138138
w03 = casadi_fmin(w03,w06);
139139
/* #21: @7 = (@4<=@3) */
@@ -157,8 +157,8 @@ static int casadi_f0(const casadi_real** arg, casadi_real** res, casadi_int* iw,
157157
w01 = (w07?w00:0);
158158
/* #28: @7 = (!@7) */
159159
w07 = (! w07 );
160-
/* #29: @2 = 6.4 */
161-
w02 = 6.4000000000000004e+00;
160+
/* #29: @2 = 7.2 */
161+
w02 = 7.2000000000000002e+00;
162162
/* #30: @6 = (@2<=@3) */
163163
w06 = (w02<=w03);
164164
/* #31: @4 = (@3<@4) */
@@ -171,8 +171,8 @@ static int casadi_f0(const casadi_real** arg, casadi_real** res, casadi_int* iw,
171171
w04 = (w06?w04:0);
172172
/* #35: @6 = (!@6) */
173173
w06 = (! w06 );
174-
/* #36: @10 = 5.6 */
175-
w10 = 5.6000000000000005e+00;
174+
/* #36: @10 = 6.3 */
175+
w10 = 6.2999999999999998e+00;
176176
/* #37: @11 = (@10<=@3) */
177177
w11 = (w10<=w03);
178178
/* #38: @2 = (@3<@2) */
@@ -185,8 +185,8 @@ static int casadi_f0(const casadi_real** arg, casadi_real** res, casadi_int* iw,
185185
w02 = (w11?w02:0);
186186
/* #42: @11 = (!@11) */
187187
w11 = (! w11 );
188-
/* #43: @12 = 4.8 */
189-
w12 = 4.8000000000000007e+00;
188+
/* #43: @12 = 5.4 */
189+
w12 = 5.4000000000000004e+00;
190190
/* #44: @13 = (@12<=@3) */
191191
w13 = (w12<=w03);
192192
/* #45: @10 = (@3<@10) */
@@ -199,8 +199,8 @@ static int casadi_f0(const casadi_real** arg, casadi_real** res, casadi_int* iw,
199199
w10 = (w13?w10:0);
200200
/* #49: @13 = (!@13) */
201201
w13 = (! w13 );
202-
/* #50: @14 = 4 */
203-
w14 = 4.;
202+
/* #50: @14 = 4.5 */
203+
w14 = 4.5000000000000000e+00;
204204
/* #51: @15 = (@14<=@3) */
205205
w15 = (w14<=w03);
206206
/* #52: @12 = (@3<@12) */
@@ -213,8 +213,8 @@ static int casadi_f0(const casadi_real** arg, casadi_real** res, casadi_int* iw,
213213
w12 = (w15?w12:0);
214214
/* #56: @15 = (!@15) */
215215
w15 = (! w15 );
216-
/* #57: @16 = 3.2 */
217-
w16 = 3.2000000000000002e+00;
216+
/* #57: @16 = 3.6 */
217+
w16 = 3.6000000000000001e+00;
218218
/* #58: @17 = (@16<=@3) */
219219
w17 = (w16<=w03);
220220
/* #59: @14 = (@3<@14) */
@@ -227,8 +227,8 @@ static int casadi_f0(const casadi_real** arg, casadi_real** res, casadi_int* iw,
227227
w14 = (w17?w14:0);
228228
/* #63: @17 = (!@17) */
229229
w17 = (! w17 );
230-
/* #64: @18 = 2.4 */
231-
w18 = 2.4000000000000004e+00;
230+
/* #64: @18 = 2.7 */
231+
w18 = 2.7000000000000002e+00;
232232
/* #65: @19 = (@18<=@3) */
233233
w19 = (w18<=w03);
234234
/* #66: @16 = (@3<@16) */
@@ -241,8 +241,8 @@ static int casadi_f0(const casadi_real** arg, casadi_real** res, casadi_int* iw,
241241
w16 = (w19?w16:0);
242242
/* #70: @19 = (!@19) */
243243
w19 = (! w19 );
244-
/* #71: @20 = 1.6 */
245-
w20 = 1.6000000000000001e+00;
244+
/* #71: @20 = 1.8 */
245+
w20 = 1.8000000000000000e+00;
246246
/* #72: @21 = (@20<=@3) */
247247
w21 = (w20<=w03);
248248
/* #73: @18 = (@3<@18) */
@@ -255,8 +255,8 @@ static int casadi_f0(const casadi_real** arg, casadi_real** res, casadi_int* iw,
255255
w18 = (w21?w18:0);
256256
/* #77: @21 = (!@21) */
257257
w21 = (! w21 );
258-
/* #78: @22 = 0.8 */
259-
w22 = 8.0000000000000004e-01;
258+
/* #78: @22 = 0.9 */
259+
w22 = 9.0000000000000002e-01;
260260
/* #79: @23 = (@22<=@3) */
261261
w23 = (w22<=w03);
262262
/* #80: @20 = (@3<@20) */
Binary file not shown.

0 commit comments

Comments
 (0)