LinearAlgebra and MatrixOperation Update

4 files changed, 19 insertions, 36 deletions

diff --git a/src/c/CACSD/includes/lqr.h b/src/c/CACSD/includes/lqr.h
index 5b20ee83..062d6e41 100644
--- a/src/c/CACSD/includes/lqr.h
+++ b/src/c/CACSD/includes/lqr.h
@@ -17,7 +17,7 @@
 extern "C" {
 #endif
 
-void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, double* S, double* X, double* K);
+void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K);
 
 #ifdef  __cplusplus 
 } /* extern "C" */
diff --git a/src/c/CACSD/interfaces/int_lqr.h b/src/c/CACSD/interfaces/int_lqr.h
index 8deba90b..e6f534fc 100644
--- a/src/c/CACSD/interfaces/int_lqr.h
+++ b/src/c/CACSD/interfaces/int_lqr.h
@@ -16,14 +16,7 @@
 extern "C" {
 #endif
 
-#define ss2lqrd2d2(in1,size1,out1,out2) dlqra(in1,size1[0],size1[1],NULL,\
-				NULL,NULL,out1,out2);
-
-#define ss2d2d2lqrd2d2(in1,size1,in2,size2,in3,size3,out1,out2) dlqra(in1,\
-				size1[0],size1[1],in2,in3,NULL,out1,out2);
-
-#define ss2d2d2d2lqrd2d2(in1,size1,in2,size2,in3,size3,in4,size4,out1,out2) \
-				dlqra(in1,size1[0],size1[1],in2,in3,in4,out1,out2);
+#define ss2lqrd2d2(in1,size1,out1,out2) dlqra(in1,size1[0],size1[1],out1,out2);
 
 #ifdef  __cplusplus
 } /* extern "C" */
diff --git a/src/c/CACSD/lqe/dlqea.c b/src/c/CACSD/lqe/dlqea.c
index e0be5b34..63f8d62d 100644
--- a/src/c/CACSD/lqe/dlqea.c
+++ b/src/c/CACSD/lqe/dlqea.c
@@ -54,7 +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));
-	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);
 
 	dtransposea(K_lqr,sys_rows - no_of_st,no_of_st,K);
 }
\ No newline at end of file
diff --git a/src/c/CACSD/lqr/dlqra.c b/src/c/CACSD/lqr/dlqra.c
index 1440c3a8..02ac1504 100644
--- a/src/c/CACSD/lqr/dlqra.c
+++ b/src/c/CACSD/lqr/dlqra.c
@@ -22,8 +22,7 @@
 #include "schur.h"
 #include "matrixDivision.h" 
 
-void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \
-            double* S, double* K, double* X)
+void dlqra(double* sys, int sys_rows, int sys_cols, double* X, double* K)
 {
     int no_of_states, no_of_inputs, no_of_outputs, dom = 1;
     int row,col;
@@ -33,7 +32,7 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \
 
     double *A, *B, *C, *D;
     double *B_t, *C_t, *D_t;
-    //double *Q, *R, *S;
+    double *Q, *R, *S;
     double *Ri, *LA, *LE;
     double *BRi, *StRi, *S_t;
     double *buf1, *buf2, *buf3, *buf4, *buf5, *buf6;
@@ -91,29 +90,20 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \
 
     dom = (int)sys[(sys_rows*(sys_cols-2)) + no_of_states];
 
+    Q = (double*) malloc (no_of_states*no_of_states*sizeof(double));
+    R = (double*) malloc (no_of_inputs*no_of_inputs*sizeof(double));
+    S = (double*) malloc (no_of_inputs*no_of_states*sizeof(double));
+
     dtransposea(B,no_of_states,no_of_inputs,B_t);
     dtransposea(C,no_of_outputs,no_of_states,C_t);
     dtransposea(D,no_of_outputs,no_of_inputs,D_t);
 
-    if(Q == NULL)
-    {/*If Q is not provided*/
-        Q = (double*) malloc (no_of_states*no_of_states*sizeof(double));
-        dmulma(C_t,no_of_states,no_of_outputs,C,no_of_outputs,no_of_states,Q);
-    }
-    
-    if(R == NULL)
-    {/*If R is not provided*/
-        R = (double*) malloc (no_of_inputs*no_of_inputs*sizeof(double));
-        dmulma(D_t,no_of_inputs,no_of_outputs,D,no_of_outputs,no_of_inputs,R);
-    }
-
-    if(S == NULL)
-    {/*If Q is not provided*/    
-        S = (double*) malloc (no_of_inputs*no_of_states*sizeof(double));
-        dmulma(D_t,no_of_inputs,no_of_outputs,C,no_of_outputs,no_of_states,S);
-    }
+    dmulma(C_t,no_of_states,no_of_outputs,C,no_of_outputs,no_of_states,Q);
+    dmulma(D_t,no_of_inputs,no_of_outputs,D,no_of_outputs,no_of_inputs,R);
+    dmulma(D_t,no_of_inputs,no_of_outputs,C,no_of_outputs,no_of_states,S);
 
     /*Free up unwanted variables*/
+
     free(C);
     free(C_t);
     free(D);
@@ -187,8 +177,8 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \
 
         /*Freeup umwanted variables*/
         free(A);    
-        //free(Q);
-        //free(R);
+        free(Q);
+        free(R);
         free(BRi);
         free(S_t);
         free(StRi);
@@ -288,7 +278,7 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \
         }
 
 
-        //free(Q);
+        free(Q);
         free(BRi);
         free(S_t);
         free(StRi);
@@ -326,7 +316,7 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \
 
          /*inv(B'XB+R)*/
         dmulma(B_t,no_of_inputs,no_of_states,X,no_of_states,no_of_states,buf3);
-        dmulma(buf3,no_of_inputs,no_of_states,B,no_of_states,no_of_inputs,buf6);
+        dmulma(buf3,no_of_inputs,no_of_states,B_t,no_of_states,no_of_inputs,buf6);
         dadda(buf6,no_of_inputs*no_of_inputs,R,no_of_inputs*no_of_inputs,buf5);
         dinverma(buf5,buf6,no_of_inputs);
         /*B'XA+S*/
@@ -343,14 +333,14 @@ void dlqra(double* sys, int sys_rows, int sys_cols, double* Q, double* R, \
 
         free(A);
         free(B);
-        //free(R);
+        free(R);
         free(buf5);
         free(buf6);
         
     }
 
     free(B_t);
-    //free(S);
+    free(S);
     free(wsmall);
     free(X12);
     free(phi12);