Changeset 1210 for library

Timestamp:

10/03/10 23:32:46 (14 years ago)

Author:

vahalam

Message:

oprava chyby

Files:

• library/bdm/design/lq_ctrl.h (modified) (7 diffs)

library/bdm/design/lq_ctrl.h

@@ -58 +58 @@
     virtual void redesign() {
                 if (curtime == -1) curtime = horizon;
-                
-                if (curtime > 0) curtime--;
-
-                if (curtime >= 0){
+                                
+                if (curtime > 0){
+                        curtime--;
                         generateLmat(curtime);
                 }
-
+                //cout << "time " << curtime << endl;
                 //report time 0 reached - LQG designing complete
                 //if(curtime == 0) cout << "time 0 reached" << endl;
@@ -198 +197 @@
                 //set data in tmpMatRow - other times then current replace using model
                 RV tmpQrv = sourceQfn.rv;
+//cout << "Qrv " << tmpQrv << endl << "total crv " << trs_crv << endl;
                 ivec j_vec(1);
+                vec copycol;
+                ivec copysource;
                 for(int j = 0; j < tmpQrv.length(); j++){                       
                         j_vec(0) = j;
-                        
-                        if( (tmpQrv.time(j) == 0) && (sum(tmpQrv(j_vec).findself(trs_crv)) > (-1)) ) {//sum is only formal, summed vector is in fact scalar
+//cout << "matrow\n" << tmpMatRow << endl;
+
+                        if( /*(tmpQrv.time(j) == 0) &&*/ (sum(tmpQrv(j_vec).findself(trs_crv)) > (-1)) ) {//sum is only formal, summed vector is in fact scalar
                                 //jth element of tmpQrv is also element of trs_crv with a proper time
+//cout << "copy" << endl;
                                 ivec copytarget = (tmpQrv(j_vec)).dataind(trs_crv); //get target column position in tmpMatRow
                                 ivec copysource = (tmpQrv(j_vec)).dataind(tmpQrv); //get source column position in Losses(i).Q
-                                if(copytarget.size() != copysource.size()) {return mat(0); /*error*/}
-                                vec copycol;
+                                if(copytarget.size() != copysource.size()) {return mat(0); /*error*/}                           
                                 for(int k = 0; k < copysource.size(); k++){
                                         copycol = sourceQfn.Q._Ch().get_col(copysource(k));
+                                        copycol += tmpMatRow.get_col(copytarget(k));
                                         tmpMatRow.set_col(copytarget(k), copycol);
                                 }                                       
                         }
                         else {
-//cout << "USING MODEL" << endl;
+//cout << "USING MODEL on " << tmpQrv(j,j) << endl;
+//cout << "model" << endl;
                                 //jth tmpQrv element is not in trs_crv -> using Model to teplace it
-                                ivec copysource;// = (tmpQrv(j_vec)).findself(tmpQrv); //get source column position in Losses(i).Q
+                                // = (tmpQrv(j_vec)).findself(tmpQrv); //get source column position in Losses(i).Q
 
                                 //int selectedModel = -1;
@@ -320 +325 @@
                         fakeM1.add(RV("1", 1, 0));
                         fakeM1.t_plus(1); //RV in time t+1 => necessary use of Model to get RV in time t
+                        fakeM1.set_time((RV("1", 1, 1).findself(fakeM1))(0) , 0);
+//cout << fakeM1 << endl;
                         fakeQfn.rv = fakeM1;
                         
@@ -356 +363 @@
                                 
                         //get matrix row via getMatRow method
+                        //cout << "XXXXXXXXXXXXXXX" << endl;
                         tmpMatRow = getMatRow(fakeQfn);
+                        //cout << tmpMatRow << endl;
                 /*cout << "submatrix ( " << rowIndex << ", " << 
                         (rowIndex + fakeQfn.Q.rows() - 1) << ", 0, " << (trs_crv.countsize() - 1) << ")" << endl;
@@ -403 +412 @@
                 if(submatidx == 0) qr_submat            = post_qr.get(0,                (sizeA - 1),                    0,              (sizeA - 1));  //(int r1, int r2, int c1, int c2)
                 else if(submatidx == 1) qr_submat       = post_qr.get(0,                (sizeA - 1),                    sizeA,  (post_qr.cols() - 1));
-                else qr_submat                                          = post_qr.get(sizeA,    (sizeA + colsB - 1),    sizeA,  (post_qr.cols() - 1));
+                else {
+                        if(post_qr.cols() > post_qr.rows()) { //extend post_qr matrix to be at least square
+                                post_qr.set_size(post_qr.cols(), post_qr.cols(), true);                         
+                        }
+                        
+                        qr_submat                                               = post_qr.get(sizeA,    (sizeA + colsB - 1),    sizeA,  (post_qr.cols() - 1));
+                        
+                }
         
                 return qr_submat;
@@ -417 +433 @@
                 trs_crv.add(rvc);
                 trs_crv.add(RV("1", 1, 0));
-                
+                        
                 //!first time, time = horizon - 1
                 if(timestep == (horizon-1))             
@@ -429 +445 @@
                 qr(pre_qr, tmpQ, post_qr);
 //cout << "preQR " << pre_qr << endl << "postQR" << post_qr << endl;
-                mat qrA = get_qr_submatrix(0);
+                mat qrA = get_qr_submatrix(0);          
                 mat qrB = get_qr_submatrix(1);
                 mat qrC = get_qr_submatrix(2);