Changeset 1349 for applications

Timestamp:

05/03/11 18:10:42 (14 years ago)

Author:

sindj

Message:

Oprava dalsich drobnych chyb (pridavani otcovske podminky do totalne neutralnich poly). Jeste nejake zbyva odstranit. JS

Location:

applications/robust

Files:

• main.cpp (modified) (5 diffs)
• robustlib.cpp (modified) (3 diffs)
• robustlib.h (modified) (18 diffs)

applications/robust/main.cpp

@@ -18 +18 @@
 
 const int emlig_size = 2;
-const int utility_constant = 3;
+const int utility_constant = 10;
 
 
@@ -139 +139 @@
         vector<vector<string>> strings;
 
-        char* file_strings[3] = {"c:\\Users\\Hontik\\Desktop\\dataGCClosePercDiff","c:\\ar_student_single","c:\\ar_cauchy_single"};
+        char* file_strings[3] = {"c:\\dataCDClosePercDiff","c:\\ar_student_single","c:\\ar_cauchy_single"};
 
         for(int i = 0;i<3;i++)
@@ -171 +171 @@
                 vector<vec> conditions;
                 //emlig* emliga = new emlig(2);
-                RARX* my_rarx = new RARX(2,30,false);
+                RARX* my_rarx = new RARX(2,10,false);
                 
                 
                 mat V0 = 0.0001 * eye ( 3 );
-                ARX* my_arx = new ARX(0.97);
+                ARX* my_arx = new ARX(0.85);
                 my_arx->set_statistics ( 1, V0 ); //nu is default (set to have finite moments)
                 my_arx->set_constant ( false );
@@ -200 +200 @@
                                 conditions[k-3].ins(0,strings[j][k]);
 
-                                cout << "Condition:" << conditions[k-3] << endl;
+                                // cout << "Condition:" << conditions[k-3] << endl;
 
                                 my_rarx->bayes(conditions[k-3]);
@@ -284 +284 @@
                                         */
 
-                                        cout << "Coefficients: " << poly_coefs << endl;
+                                        //cout << "Coefficients: " << poly_coefs << endl;
                                                                                 
                                         /*

applications/robust/robustlib.cpp

@@ -275 +275 @@
                                 simplex->insert_gamma(0,bracket*multiplier,a_0-(*as_ref).first);                                                                
 
-                                bracket *= fact(sigma_order);
+                                // bracket *= fact(sigma_order);
 
                                 for(int k = 0;k < as1_order-1;k++)
@@ -299 +299 @@
 
                                         simplex->insert_gamma(k+1,local_bracket*multiplier,a_0-(*as_ref).first);
-                                        
-                                        bracket += local_bracket*fact(sigma_order-k);
+
+                                        int division_factor = 1;
+                                        for(int s = 0;s<k;s++)
+                                        {
+                                                division_factor *= k-s;
+                                        }
+                                        
+                                        bracket += local_bracket/division_factor; //local_bracket*fact(sigma_order-k);
                                 }                               
 
@@ -311 +317 @@
                         simplex->insert_gamma(0,correction_term_base,a_0);                      
 
-                        correction_term = fact(sigma_order)*correction_term_base;
+                        correction_term = correction_term_base;//fact(sigma_order)*correction_term_base;
 
                         //cout << c << int_value << endl;

applications/robust/robustlib.h

@@ -22 +22 @@
 using namespace itpp;
 
-const double max_range = 10;//numeric_limits<double>::max()/10e-10;
+const double max_range = 50;//numeric_limits<double>::max()/10e-10;
 
 /// An enumeration of possible actions performed on the polyhedrons. We can merge them or split them.
@@ -434 +434 @@
         };
 
+        ~c_statistic()
+        {
+                delete end_poly;
+                delete start_poly;
+        }
+
         void append_polyhedron(int row, polyhedron* appended_start, polyhedron* appended_end)
         {
@@ -732 +738 @@
         double normalization_factor;
 
+        int condition_order;
+
         
 
@@ -948 +956 @@
                                                         else
                                                         {
-                                                                current_parent->raise_multiplicity();                                                           
+                                                                current_parent->raise_multiplicity();
+                                                                current_parent->totally_neutral = true;
+                                                                current_parent->parentconditions.insert(toadd);
                                                         }
 
@@ -1013 +1023 @@
         double min_ll;
 
+        double log_nc;
+
         vector<multiset<my_ivec>> correction_factors;
 
@@ -1026 +1038 @@
 
                 min_ll = numeric_limits<double>::max();
+
+                condition_order = 0;
         }
 
         /// A constructor for creating an emlig when the user wants to create the statistic by himself. The creation of a
         /// statistic is needed outside the constructor. Used for a user defined prior distribution on the parameters.
-        emlig(c_statistic statistic)
+        emlig(c_statistic statistic, int condition_order)
         {
                 this->statistic = statistic;    
 
                 min_ll = numeric_limits<double>::max();
-        }
+
+                this->condition_order = condition_order;
+        }
+
 
         void step_me(int marker)
@@ -1057 +1074 @@
                                 */
 
-                                cout << "Stepped." << endl;
+                                // cout << "Stepped." << endl;
+
+                                for(set<simplex*>::iterator sim_ref = (*horiz_ref).triangulation.begin();sim_ref!=(*horiz_ref).triangulation.end();sim_ref++)
+                                {
+                                        if((*sim_ref)->vertices.size()!=i+1)
+                                        {
+                                                cout << "Something is wrong." << endl;
+                                        }
+                                }
                                 
                                 /*
@@ -1165 +1190 @@
                 bool should_remove = (toremove.size() != 0);
                 bool should_add    = (toadd.size() != 0);
+
+                if(should_remove)
+                {
+                        condition_order--;
+                }
+
+                if(should_add)
+                {
+                        condition_order++;
+                }
 
                 for_splitting.clear();
@@ -1250 +1285 @@
                                         local_condition = appended_coords*toadd;
 
+                                        cout << "Vertex multiplicity: "<< current_vertex->get_multiplicity() << endl;
+
                                         current_vertex->set_state(local_condition,SPLIT);
 
@@ -1255 +1292 @@
                                         if(local_condition == 0)
                                         {
+                                                cout << "Condition to add: " << toadd << endl;
+                                                cout << "Vertex coords: " << appended_coords << endl;
+
                                                 current_vertex->totally_neutral = true;
 
                                                 current_vertex->raise_multiplicity();
+                                                current_vertex->parentconditions.insert(condition_to_add);
 
                                                 current_vertex->negativeneutralvertices.insert(current_vertex);
@@ -1298 +1339 @@
                 }
 
-                
+                //step_me(1);
                 
                 if(should_remove)
@@ -1326 +1367 @@
                                         if((*merge_ref)->get_multiplicity()>1)
                                         {
+                                                (*merge_ref)->parentconditions.erase(condition_to_remove);
+
                                                 if(k==1)
                                                 {
@@ -1575 +1618 @@
                 }
                 
-                /*
+                
                 vector<int> sizevector;
                 for(int s = 0;s<statistic.size();s++)
@@ -1581 +1624 @@
                         sizevector.push_back(statistic.row_size(s));
                         cout << statistic.row_size(s) << ", ";
-                }*/
+                }
                 
 
-                //cout << endl;
-
-                // this->step_me(2);
+                cout << endl;
+
+                if(this->statistic.row_size(2)==62)
+                {
+                        this->step_me(2);
+                }
 
                 if(should_add)
@@ -1743 +1789 @@
                 }
 
+                /*
                 vector<int> sizevector;
                 //sizevector.clear();
@@ -1752 +1799 @@
                 
                 cout << endl;
-                
+                */
+
+                cout << "Normalization factor: " << normalization_factor << endl;       
+
+                log_nc = log(normalization_factor) + logfact(condition_order-number_of_parameters-2);
 
                 /*
@@ -2308 +2359 @@
         }
 
+        int logfact(int factor)
+        {
+                if(factor>0)
+                {
+                        return factor+logfact(factor-1);
+                }
+                else
+                {
+                        return 0;
+                }
+        }
 protected:
 
@@ -2660 +2722 @@
                         posterior->add_condition(yt);
                 }
+
+                
                                 
         }