Changeset 1268 for applications/robust/robustlib.cpp

Timestamp:

01/05/11 18:01:55 (13 years ago)

Author:

sindj

Message:

Dodelani vypoctu pri degenerovanych podminkach. Zda se, ze docela funguje, ale neni zohlednena pocatecni divergence integralu aposteriorna pres parametry. Zbyva odladit. JS

Files:

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

applications/robust/robustlib.cpp

@@ -20 +20 @@
                                         if(should_integrate)
                                         {
+                                                emlig* current_emlig;
+
+                                                if(this->my_emlig!=NULL)
+                                                {
+                                                        current_emlig = this->my_emlig;
+                                                }
+                                                else
+                                                {
+                                                        throw exception("The statistic of the polyhedron you are trying to integrate over doesn't belong to any emlig!");
+                                                }                                               
+
                                                 toprow* as_toprow = (toprow*)this;
 
@@ -53 +64 @@
 
                                                 double int_value = 0;
+                                                double det_jacobian = det(jacobian);
                                                 for(map<double,int>::iterator as_ref = as.begin();as_ref!=as.end();as_ref++)
                                                 {
-                                                        int fac_order = ((toprow*)this)->condition_order-as.size()-1;
+                                                        int condition_order = ((toprow*)this)->condition_order-1;
 
-                                                        double fac_value = 1;
+                                                        double multiplier = det_jacobian;
                                                         if(a_0!=(*as_ref).first)
-                                                        {
-                                                                //fac_value = ((double)tgamma(fac_order)*det(jacobian))/(*as_ref).first/pow((*as_ref).first-a_0,fac_order); 
-                                                                
-                                                                fac_value /= (*as_ref).first;
+                                                        {                                                               
+                                                                int as1_order = (*as_ref).second;
 
+                                                                current_emlig->set_correction_factors(as1_order);
+
+                                                                vector<double> factors;
+                                                                int number_of_factors = 0;                                                              
                                                                 for(map<double,int>::iterator as2_ref = as.begin();as2_ref!=as.end();as2_ref++)
                                                                 {
+                                                                        
                                                                         if(as2_ref!=as_ref)
+                                                                        {                                                                               
+                                                                                for(int k = 0;k<(*as2_ref).second;k++)
+                                                                                {
+                                                                                        factors.push_back((*as_ref).first-(*as2_ref).first);
+                                                                                }
+
+                                                                                multiplier        /= pow((*as_ref).first-(*as2_ref).first,(*as2_ref).second);
+                                                                                number_of_factors += (*as2_ref).second;
+                                                                        }
+                                                                        else
                                                                         {
-                                                                                double current_factor = (*as_ref).first-(*as2_ref).first;
+                                                                                factors.push_back((*as_ref).first);
 
-                                                                                fac_value /= current_factor;
+                                                                                multiplier        /= (*as_ref).first;
+                                                                                number_of_factors += 1;
+                                                                        }                                                                       
+                                                                }
 
-                                                                                                                                                                
-                                                                        }
-                                                                }
+                                                                double bracket = fact(condition_order-1-number_of_factors)/fact(as1_order-1)/*/pow((*as_ref).first-a_0,condition_order-1-number_of_factors)*/;
+                                                                for(int k = 0;k < as1_order-1;k++)
+                                                                {
+                                                                        double bracket_factor = pow((double)-1,k+1)*fact(condition_order-2-number_of_factors-k)/fact(as1_order-2-k)/pow((*as_ref).first-a_0,condition_order-2-number_of_factors-k);
+                                                                        
+                                                                        for(set<my_ivec>::iterator combi_ref = this->my_emlig->correction_factors[k].begin();combi_ref!=this->my_emlig->correction_factors[k].end();combi_ref++)
+                                                                        {
+                                                                                double bracket_combination = 1;
+                                                                                for(int j = 0;j<(*combi_ref).size();j++)
+                                                                                {
+                                                                                        bracket_combination /= factors[(*combi_ref)[j]];
+                                                                                }
+
+                                                                                bracket+=bracket_factor*bracket_combination;                                                                    
+                                                                        }                                                                       
+                                                                }                                                               
+
+                                                                int_value += multiplier*bracket;        
+
                                                         }
                                                         else
                                                         {
                                                                 throw new exception("Should this happen? a_i=a_0 in the formula for integrating over a simplex! I think it can happen with 0 probability(when phi*2*v_0=phi*v_i)");
-                                                        }
-
-                                                        
-                                                        int_value += fac_value;                                                 
+                                                        }                                               
+                                                                                                        
                                                 }