Changeset 1367 for applications/robust/robustlib.h

Timestamp:

05/11/11 18:48:05 (13 years ago)

Author:

sindj

Message:

Nova verze main s predikcemi i lognorm faktory. Pristup na DDE data. JS

Files:

• applications/robust/robustlib.h (modified) (10 diffs)

applications/robust/robustlib.h

@@ -1112 +1112 @@
         void step_me(int marker)
         {
-                
+                set<int> orders;
+
                 for(int i = 0;i<statistic.size();i++)
                 {
@@ -1125 +1126 @@
                                 if(i==statistic.size()-1)
                                 {
+                                        orders.insert(((toprow*)horiz_ref)->condition_order);
+                                        
+                                        /*
                                         cout << ((toprow*)horiz_ref)->condition_sum << "   " << ((toprow*)horiz_ref)->probability << endl;
                                         cout << "Condition: " << ((toprow*)horiz_ref)->condition_sum << endl;
-                                        cout << "Order:" << ((toprow*)horiz_ref)->condition_order << endl;
+                                        cout << "Order:" << ((toprow*)horiz_ref)->condition_order << endl;*/
                                 }
                                 
@@ -1142 +1146 @@
                                 }
 
+                                /*
                                 for(set<simplex*>::iterator sim_ref = (*horiz_ref).triangulation.begin();sim_ref!=(*horiz_ref).triangulation.end();sim_ref++)
                                 {
@@ -1149 +1154 @@
                                         }
                                 }
+                                */
                                 
                                 /*
@@ -1437 +1443 @@
 
                         for(vector<list<polyhedron*>>::iterator vert_ref = for_merging.begin();vert_ref<for_merging.end();vert_ref++)
-                        {
-                                for(list<polyhedron*>::reverse_iterator merge_ref = vert_ref->rbegin();merge_ref!=vert_ref->rend();merge_ref++)
+                        {                               
+                                for(list<polyhedron*>::iterator merge_ref = (*vert_ref).begin();merge_ref!=(*vert_ref).end();merge_ref++)
                                 {
                                         if((*merge_ref)->get_multiplicity()>1)
@@ -1649 +1655 @@
                                                 }                               
 
-                                                statistic.delete_polyhedron(k-1,*merge_ref);
-
-                                                
+                                                statistic.delete_polyhedron(k-1,*merge_ref);                                            
+
+                                                for_splitting[k-1].remove(*merge_ref);
+                                                //for_merging[k].remove(*loc_merge_ref);
 
                                                 if(k==1)
                                                 {                                                       
-                                                        vertices_to_be_reduced.insert((vertex*)(*merge_ref));
-                                                        for_splitting[k-1].remove(*merge_ref);
+                                                        vertices_to_be_reduced.insert((vertex*)(*merge_ref));                                                   
                                                 }
+                                                /*
                                                 else
-                                                {
-                                                        delete (*merge_ref);
-                                                        for_splitting[k-1].remove(*merge_ref);
+                                                {                                                       
+                                                        delete (*loc_merge_ref);
                                                 }
+                                                */                                              
                                         }
                                 }                       
@@ -1881 +1888 @@
 
                 log_nc = log(normalization_factor) + logfact(condition_order-number_of_parameters-2)-(condition_order-number_of_parameters-2)*log(2.0);
+
+                if(condition_order == 20)
+                                                        step_me(88);
+
+                //cout << "Factorial factor: " << condition_order-number_of_parameters-2 << endl;
 
                 /*
@@ -2046 +2058 @@
                                 for(multimap<double,double>::iterator pg_ref = (*v_ref).begin();pg_ref!=(*v_ref).end();pg_ref++)
                                 {
-                                        pg_sum += exp((sampled_simplex->min_beta-(*pg_ref).second)/sigma)*pow((*pg_ref).second/sigma,(int)conditions.size()-number_of_parameters-1)*(*pg_ref).second/fact(conditions.size()-number_of_parameters-1)*(*pg_ref).first;
+                                        pg_sum += exp((sampled_simplex->min_beta-(*pg_ref).second)/sigma)*pow((*pg_ref).second/sigma,(int)conditions.size())*(*pg_ref).second/fact(conditions.size())*(*pg_ref).first;
                                 }                                       
                         }
@@ -2055 +2067 @@
                                 for(multimap<double,double>::iterator ng_ref = (*v_ref).begin();ng_ref!=(*v_ref).end();ng_ref++)
                                 {
-                                        ng_sum += exp((sampled_simplex->min_beta-(*ng_ref).second)/sigma)*pow((*ng_ref).second/sigma,(int)conditions.size()-number_of_parameters-1)*(*ng_ref).second/fact(conditions.size()-number_of_parameters-1)*(*ng_ref).first;
+                                        ng_sum += exp((sampled_simplex->min_beta-(*ng_ref).second)/sigma)*pow((*ng_ref).second/sigma,(int)conditions.size())*(*ng_ref).second/fact(conditions.size())*(*ng_ref).first;
                                 }                                       
                         }
@@ -2788 +2800 @@
                 this->has_constant = has_constant;
                 
-                posterior = new emlig(number_of_parameters,0.01);
+                posterior = new emlig(number_of_parameters,0.001);
 
                 this->window_size = window_size;