Changeset 1276 for applications/robust

Timestamp:

02/17/11 18:11:46 (14 years ago)

Author:

sindj

Message:

Oprava chyb ve vypoctu integralu pres polytopy. JS

Files:

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

applications/robust/robustlib.cpp

@@ -91 +91 @@
                                         if(vert_ref != base_ref)
                                         {
-                                                vec relative_coords = (*vert_ref)->get_coordinates()-base_vertex->get_coordinates();
-
-                                                
+                                                vec relative_coords = (*vert_ref)->get_coordinates()-base_vertex->get_coordinates();                                            
 
                                                 jacobian.set_row(row_count,relative_coords);
@@ -99 +97 @@
                                                 double new_a = relative_coords*cur_condition;
 
-                                                if(new_a + a_0 == 0)
+                                                if(new_a + a_0 == 0 || new_a == 0)
                                                 {
                                                         base_ref++;
@@ -113 +111 @@
                                                 }
                                                 
-                                                cout << "Absolute coords:(V"  << row_count << ")" << (*vert_ref)->get_coordinates() << endl;
-                                                //cout << "Relative coords:(V"  << row_count << ")" << relative_coords << endl;
+                                                // cout << "Absolute coords:(V"  << row_count << ")" << (*vert_ref)->get_coordinates() << 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));
@@ -178 +176 @@
                                 }                                       
 
-                                double bracket = fact(condition_order-number_of_factors)/fact(as1_order-1)/pow(a_0+(*as_ref).first,condition_order-number_of_factors);
+                                double bracket = fact(condition_order-my_emlig->number_of_parameters)/fact(as1_order-1)/pow(a_0-(*as_ref).first,condition_order-my_emlig->number_of_parameters+2);
                                 for(int k = 0;k < as1_order-1;k++)
                                 {
-                                        double bracket_factor = pow((double)-1,k+1)*fact(condition_order-number_of_factors-k)/fact(as1_order-2-k)/pow(a_0+(*as_ref).first,condition_order-number_of_factors-k);
+                                        double bracket_factor = pow((double)-1,k+1)*fact(condition_order-my_emlig->number_of_parameters-k)/fact(as1_order-1-k)/pow(a_0-(*as_ref).first,condition_order-my_emlig->number_of_parameters+1-k);
                                         
+                                        // TODO TADY NEKDE JE CHYBA, NEDOJDE KE SPRAVNEMU NAPLNENI CORRECTION FAKTORU!!!
                                         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++)
+                                                for(int j = 0;j<=(*combi_ref).size();j++)
                                                 {
                                                         bracket_combination /= factors[(*combi_ref)[j]];
@@ -202 +201 @@
 
                         
-                        correction_term *= fact(condition_order-my_emlig->number_of_parameters)/pow(a_0,condition_order-my_emlig->number_of_parameters+1);
+                        correction_term *= fact(condition_order-my_emlig->number_of_parameters)/pow(a_0,condition_order-my_emlig->number_of_parameters+2);
 
                         // cout << c << int_value << endl;