diff options
| author | yash1112 | 2017-07-07 22:34:47 +0530 |
|---|---|---|
| committer | yash1112 | 2017-07-07 22:34:47 +0530 |
| commit | 2340409c98f9b15bb23944b991e97a1aa4e88ce0 (patch) | |
| tree | 8fa462e65aca52e5e933dee026a78c31baf0181c /src/c/CACSD/lqe/dlqea.c | |
| parent | f577f255fd5c1d30bc770e9b053823ada8684528 (diff) | |
| parent | 69c573fe2e59236f063aaa94dcd44b556f945cbc (diff) | |
| download | Scilab2C_fossee_old-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.gz Scilab2C_fossee_old-2340409c98f9b15bb23944b991e97a1aa4e88ce0.tar.bz2 Scilab2C_fossee_old-2340409c98f9b15bb23944b991e97a1aa4e88ce0.zip | |
1.Sci2cDeps updated 2.Windows compatibility resolved
Diffstat (limited to 'src/c/CACSD/lqe/dlqea.c')
| -rw-r--r-- | src/c/CACSD/lqe/dlqea.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/c/CACSD/lqe/dlqea.c b/src/c/CACSD/lqe/dlqea.c index e0be5b3..06c1c6e 100644 --- a/src/c/CACSD/lqe/dlqea.c +++ b/src/c/CACSD/lqe/dlqea.c @@ -54,7 +54,11 @@ 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 |