Changeset 1282 for applications/robust/robustlib.cpp

Timestamp:

02/21/11 09:22:08 (13 years ago)

Author:

sindj

Message:

Prvni pokusy s robustnim AR modelem. JS

Files:

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

applications/robust/robustlib.cpp

@@ -1 +1 @@
 #include "robustlib.h"
+
 
 void polyhedron::triangulate(bool should_integrate)
@@ -33 +34 @@
         double toprow::integrate_simplex(set<vertex*> simplex, char c)
         {
-                // cout << ((toprow*)this)->condition << endl;
-                
+                // cout << ((toprow*)this)->condition << endl;          
+
                 int condition_order = ((toprow*)this)->condition_order-2; // -2 by bylo, pokud chceme uniformni apriorno
 
@@ -45 +46 @@
                 {
 
-                        cout << endl;
-                        cout << ((toprow*)this)->condition << endl;
-                        cout << "C:" << condition_order+2 << "  N:" << my_emlig->number_of_parameters << "  C+N:" << condition_order-my_emlig->number_of_parameters+2 << endl;
+                        //cout << endl;
+                        //cout << ((toprow*)this)->condition << endl;
+                        //cout << "C:" << condition_order+2 << "  N:" << my_emlig->number_of_parameters << "  C+N:" << condition_order-my_emlig->number_of_parameters+2 << endl;
+                        
 
                         emlig* current_emlig;
@@ -84 +86 @@
                                 base_vertex = (*base_ref);
 
-                                cout << "Base coords:" << base_vertex->get_coordinates() << endl;
+                        
+                                //cout << endl << "Base coords:" << base_vertex->get_coordinates() << endl;
 
                                 a_0 = base_vertex->get_coordinates()*cur_condition-as_toprow->condition[0];
+                                
 
                                 int row_count = 0;
@@ -111 +115 @@
 
                                                         break;
-                                                }
-                                                
+                                                }                                               
+                                                
+                                                
+
+                                                if(a_0<current_emlig->likelihood_value)
+                                                {
+                                                        current_emlig->minimal_vertex = base_vertex;
+                                                        current_emlig->likelihood_value = a_0;
+                                                }
+
+                                                double a_m = (*vert_ref)->get_coordinates()*cur_condition-as_toprow->condition[0];
+                                                if(a_m<current_emlig->likelihood_value)
+                                                {
+                                                        current_emlig->minimal_vertex = (*vert_ref);
+                                                        current_emlig->likelihood_value = a_m;                                          
+                                                }
+
+                                                //cout << "a0:" << a_0 << " a0 coords:" << base_vertex->get_coordinates() << " am:" << a_m << " am coords:" << (*vert_ref)->get_coordinates() << endl;
+
                                                 //cout << "Absolute coords:(V"  << row_count << ")" << (*vert_ref)->get_coordinates() << endl;
-                                                cout << "Relative coords:(V"  << row_count << ")" << relative_coords << endl;
+                                                //cout << "Relative coords:(V"  << row_count << ")" << relative_coords << endl;
 
                                                 pair<map<double,int>::iterator,bool> returned = as.insert(pair<double,int>(new_a,1));
@@ -136 +157 @@
                         while(!order_correct);
                         
+                        /*
                         cout << "a_0: " << a_0 << "    ";
                         int as_count = 1;
@@ -142 +164 @@
                                 cout << "a_" << as_count << ": " << (*as_ref).first << "    ";
                                 as_count++;
-                        }
+                        }*/
 
                         double int_value = 0;
@@ -224 +246 @@
                 
 
-                        cout << "Probability:" << int_value << endl;
+                        //cout << "Probability:" << int_value << endl;
                         
                         return int_value;