Changeset 1269 for applications/robust/robustlib.cpp

Timestamp:

01/07/11 10:09:42 (13 years ago)

Author:

sindj

Message:

Oprava faktorialu zapornych cisel ve vypoctu integralu v triangulaci. Zbyva opravit nenaplneni podminky v nekterych toprow polyhedronech. JS

Files:

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

applications/robust/robustlib.cpp

@@ -18 +18 @@
                                         triangulation.push_back(new_simplex);
 
-                                        if(should_integrate)
+                                        int condition_order = ((toprow*)this)->condition_order-1;
+                                        if(should_integrate && condition_order-my_emlig->number_of_parameters >= 0)
                                         {
                                                 emlig* current_emlig;
@@ -67 +68 @@
                                                 for(map<double,int>::iterator as_ref = as.begin();as_ref!=as.end();as_ref++)
                                                 {
-                                                        int condition_order = ((toprow*)this)->condition_order-1;
-
                                                         double multiplier = det_jacobian;
                                                         if(a_0!=(*as_ref).first)
@@ -100 +99 @@
                                                                 }
 
-                                                                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)*/;
+                                                                double facti = fact(0);
+
+                                                                double bracket = fact(condition_order-number_of_factors)/fact(as1_order-1)/pow((*as_ref).first-a_0,condition_order-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);
+                                                                        double bracket_factor = pow((double)-1,k+1)*fact(condition_order-1-number_of_factors-k)/fact(as1_order-2-k)/pow((*as_ref).first-a_0,condition_order-1-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++)