diff options
Diffstat (limited to '2.3-1/src/c/CACSD/lqe')
| -rw-r--r-- | 2.3-1/src/c/CACSD/lqe/dlqea.c | 4 |
1 files changed, 0 insertions, 4 deletions
diff --git a/2.3-1/src/c/CACSD/lqe/dlqea.c b/2.3-1/src/c/CACSD/lqe/dlqea.c index 06c1c6e0..e0be5b34 100644 --- a/2.3-1/src/c/CACSD/lqe/dlqea.c +++ b/2.3-1/src/c/CACSD/lqe/dlqea.c @@ -54,11 +54,7 @@ void dlqea(double* sys, int sys_rows, int sys_cols, double* X, double* K) /*Calculate LQR gain*/ K_lqr = (double*) malloc(no_of_ip*no_of_st*sizeof(double)); -<<<<<<< HEAD dlqra(sys_lqr,sys_lqr_rows,sys_lqr_cols,NULL,NULL,NULL,X,K_lqr); -======= - dlqra(sys_lqr,sys_lqr_rows,sys_lqr_cols,X,K_lqr); ->>>>>>> 9e5793a7b05b23e6044a6d7a9ddd5db39ba375f0 dtransposea(K_lqr,sys_rows - no_of_st,no_of_st,K); }
\ No newline at end of file |