Changeset 1280 for applications/robust/robustlib.cpp

Timestamp:

02/18/11 21:50:33 (13 years ago)

Author:

sindj

Message:

Oprava chyb pri vypoctech integralu - nedokonceno, ale blizim se. JS

Files:

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

applications/robust/robustlib.cpp

@@ -35 +35 @@
                 // cout << ((toprow*)this)->condition << endl;
                 
-                int condition_order = ((toprow*)this)->condition_order+1; // -2 by bylo, pokud chceme uniformni apriorno
+                int condition_order = ((toprow*)this)->condition_order-2; // -2 by bylo, pokud chceme uniformni apriorno
+
+                int sigma_order = condition_order-my_emlig->number_of_parameters;
 
                 // cout << "C:" << condition_order << "  N:" << my_emlig->number_of_parameters << "  C+N:" << condition_order-my_emlig->number_of_parameters << endl;
                 // pause(0.1);
 
-                if(condition_order-my_emlig->number_of_parameters > 0)
+                if(sigma_order >= 0)
                 {
 
                         cout << endl;
                         cout << ((toprow*)this)->condition << endl;
-                        cout << "C:" << condition_order << "  N:" << my_emlig->number_of_parameters << "  C+N:" << condition_order-my_emlig->number_of_parameters << 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;
@@ -111 +113 @@
                                                 }
                                                 
-                                                // 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));
@@ -147 +149 @@
                                 int as1_order = (*as_ref).second;
                                 
-                                correction_term /= -pow((*as_ref).first,as1_order);                                     
+                                correction_term /= pow(-(*as_ref).first,as1_order);                                     
                                 
                                 current_emlig->set_correction_factors(as1_order);
@@ -174 +176 @@
                                         }
                                         
-                                }                                       
-
-                                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);
+                                }       
+
+                                
+
+                                double bracket = fact(sigma_order)/fact(as1_order-1)/pow(a_0-(*as_ref).first,sigma_order+2);
                                 for(int k = 0;k < as1_order-1;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_factor = pow((double)-1,k+1)*fact(sigma_order-k)/fact(as1_order-1-k)/pow(a_0-(*as_ref).first,sigma_order+2-k);
+                                        
+                                        ivec control_vec = ivec();
+                                        control_vec.ins(0,my_emlig->number_of_parameters-as1_order+1);          
+                                        
+                                        
+                                        for(multiset<my_ivec>::iterator combi_ref = this->my_emlig->correction_factors[k].begin();combi_ref!=this->my_emlig->correction_factors[k].upper_bound(my_ivec(control_vec));combi_ref++)
                                         {
                                                 double bracket_combination = 1;
-                                                for(int j = 0;j<=(*combi_ref).size();j++)
-                                                {
-                                                        bracket_combination /= factors[(*combi_ref)[j]];
+                                                for(int j = 0;j<(*combi_ref).size();j++)
+                                                {
+                                                        cout << "Factor vector:" << (*combi_ref) << endl;
+                                                        
+                                                        bracket_combination /= factors[(*combi_ref)[j]-1];
                                                 }
 
@@ -201 +210 @@
 
                         
-                        correction_term *= fact(condition_order-my_emlig->number_of_parameters)/pow(a_0,condition_order-my_emlig->number_of_parameters+2);
+                        correction_term *= fact(sigma_order)/pow(a_0,sigma_order+2);
 
                         // cout << c << int_value << endl;