Changeset 1384 for applications/robust/main.cpp

Timestamp:

09/01/11 20:13:22 (13 years ago)

Author:

sindj

Message:

Robustlib.h heavily commented. Commentary added in send_state_message and add_and_remove_condition methods. JS

Files:

• applications/robust/main.cpp (modified) (8 diffs)

applications/robust/main.cpp

@@ -27 +27 @@
 //const int utility_constant = 5;
 
-const int max_model_order = 1;
-const double apriorno     = 0.01;
+const int max_model_order = 2;
+const double apriorno     = 0.001;
 
 /*
@@ -99 +99 @@
                         if(has_constant)
                         {
-                                my_rarx = new RARX(ar_components.size()+1,window_size,true);
+                                my_rarx = new RARX(ar_components.size()+1,window_size,true,apriorno*sqrt(2.0),apriorno*sqrt(2.0),ar_components.size()+4);
                                 my_arx  = NULL;
                         }
                 else
                         {
-                                my_rarx = new RARX(ar_components.size(),window_size,false);
+                                my_rarx = new RARX(ar_components.size(),window_size,false,apriorno*sqrt(2.0),apriorno*sqrt(2.0),ar_components.size()+3);
                                 my_arx  = NULL;
                         }
@@ -117 +117 @@
                         {                               
                                 V0  = apriorno * eye(ar_components.size()+2); //aj tu konst
-                                V0(0,0) = 0;
+                                //V0(0,0) = 0;
                                 my_arx->set_constant(true);                             
                         }
@@ -124 +124 @@
                                 
                                 V0  = apriorno * eye(ar_components.size()+1);//menit konstantu
-                                V0(0,0) = 0;
+                                //V0(0,0) = 0;
                                 my_arx->set_constant(false);                            
                                 
                         }
 
-                        my_arx->set_statistics(1, V0, V0.rows()+1);                     
+                        my_arx->set_statistics(1, V0, V0.rows()+2);                     
                         my_arx->set_parameters(window_size);
                         my_arx->validate();
@@ -274 +274 @@
         vector<vector<string>> strings;
 
-        char* file_string = "c:\\ar_normal_single"; // "c:\\dataTYClosePercDiff"; //  
+        char* file_string =  "C:\\Users\\Hontik\\Desktop\\Bayes\\dataADClosePercDiff"; // "C:\\Users\\Hontik\\Desktop\\Bayes\\ar_normal_single"; // 
 
         char dfstring[80];
@@ -316 +316 @@
                 for(int window_size = 50;window_size < 51;window_size++)
                 {
-                        //models.push_back(new model((*model_type),true,true,window_size,0,&data_matrix));   // to su len konstruktory, len inicializujeme rozne typy
-                        //models.push_back(new model((*model_type),false,true,window_size,0,&data_matrix));
+                        models.push_back(new model((*model_type),true,true,window_size,0,&data_matrix));   // to su len konstruktory, len inicializujeme rozne typy
+                        models.push_back(new model((*model_type),false,true,window_size,0,&data_matrix));
                         models.push_back(new model((*model_type),true,false,window_size,0,&data_matrix));
-                        //models.push_back(new model((*model_type),false,false,window_size,0,&data_matrix));            
+                        models.push_back(new model((*model_type),false,false,window_size,0,&data_matrix));              
                 }
 
@@ -349 +349 @@
                         if((*model_ref)->my_rarx!=NULL) //vklada normalizacnz faktor do cur_res_lognc
                         {
-                                cur_res_lognc.ins(cur_res_lognc.size(),(*model_ref)->my_rarx->posterior->log_nc);                               
+                                cur_res_lognc.ins(cur_res_lognc.size(),(*model_ref)->my_rarx->posterior->_ll());                                
                         }
                         else
                         {
-                                cur_res_lognc.ins(cur_res_lognc.size(),(*model_ref)->my_arx->posterior().lognc());
+                                cur_res_lognc.ins(cur_res_lognc.size(),(*model_ref)->my_arx->_ll());
                         }
 
@@ -382 +382 @@
                 // result_preds.ins_col(result_preds.cols(),preds);
 
-                // cout << "Updated." << endl;
-
-
-                
+                // cout << "Updated." << endl;