Changeset 1365 for applications/robust/robustlib.cpp

Timestamp:

05/10/11 13:10:46 (13 years ago)

Author:

sindj

Message:

Cele rozkopano a znovu poskladano za ucelem spravne integrace a nic - jen se mi podarilo doplnit faktor 1/2^{n. Sakris. JS}

Files:

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

applications/robust/robustlib.cpp

@@ -147 +147 @@
                                 //cout << "Base coords: " << base_vertex->get_coordinates() << endl;
                                 //cout << "Condition: " << as_toprow->condition_sum << endl;
-                                //pause(10);
-
-                                a_0 = base_vertex->get_coordinates()*cur_condition-as_toprow->condition_sum[0];
-                                
-
+                                //pause(0.1);
+
+                                a_0 = -base_vertex->get_coordinates()*cur_condition+as_toprow->condition_sum[0];                
+                                
                                 int row_count = 0;
                                 for(set<vertex*>::iterator vert_ref = simplex->vertices.begin(); vert_ref!=simplex->vertices.end();vert_ref++)
@@ -230 +229 @@
                                 cout << "a_" << as_count << ": " << (*as_ref).first << "    ";
                                 as_count++;
-                        }*/
+                        }
+                        */
 
                         double int_value = 0;                   
@@ -269 +269 @@
                                                 multiplier        /= (*as_ref).first;
                                                 number_of_factors += 1;
-                                        }
-                                        
-                                }
-                                
+                                        }                                       
+                                }       
+
+                                double gamma_multiplier = -(*as_ref).first-a_0;
+
+                                double bracket = fact(as1_order-1)/pow(gamma_multiplier,sigma_order+1);
                                                                 
-
-                                double bracket = fact(as1_order-1)/pow(a_0-(*as_ref).first,sigma_order+1);
-                                                                
-                                simplex->insert_gamma(0,bracket*multiplier,a_0-(*as_ref).first);                                                                
-
-                                // bracket *= fact(sigma_order);
+                                simplex->insert_gamma(0,bracket*multiplier,gamma_multiplier);                                                           
+
+                                // bracket *= fact(sigma_order);                                
 
                                 for(int k = 0;k < as1_order-1;k++)
                                 {
                                         double local_bracket = 0;
-                                        double bracket_factor = -pow((double)-1,k+1)/fact(as1_order-1-k)/pow(a_0-(*as_ref).first,sigma_order-k);
+                                        double bracket_factor = 1/fact(as1_order-1-k)/pow(gamma_multiplier,sigma_order-k);//pow((double)-1,k+1)
                                         
                                         ivec control_vec = ivec();
@@ -302 +301 @@
                                         }
 
-                                        simplex->insert_gamma(k+1,local_bracket*multiplier,a_0-(*as_ref).first);
+                                        simplex->insert_gamma(k+1,local_bracket*multiplier,gamma_multiplier);
 
                                         int division_factor = 1;
@@ -314 +313 @@
 
                                 int_value += multiplier*bracket;
+
+                                
                                                                                                                                                 
                         }
 
-                        double correction_term_base = correction_term/pow(a_0,sigma_order+1);
-
-                        simplex->insert_gamma(0,correction_term_base,a_0);                      
+                        double correction_term_base = correction_term/pow(-a_0,sigma_order+1);
+
+                        simplex->insert_gamma(0,correction_term_base,-a_0);                     
 
                         correction_term = correction_term_base;//fact(sigma_order)*correction_term_base;
@@ -325 +326 @@
                         //cout << c << int_value << endl;
 
-                        int_value += correction_term;
-                
+                        int_value += correction_term;                   
 
                         //cout << "Probability:" << int_value << endl;