Changeset 1349 for applications/robust/robustlib.cpp

Timestamp:

05/03/11 18:10:42 (13 years ago)

Author:

sindj

Message:

Oprava dalsich drobnych chyb (pridavani otcovske podminky do totalne neutralnich poly). Jeste nejake zbyva odstranit. JS

Files:

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

applications/robust/robustlib.cpp

@@ -275 +275 @@
                                 simplex->insert_gamma(0,bracket*multiplier,a_0-(*as_ref).first);                                                                
 
-                                bracket *= fact(sigma_order);
+                                // bracket *= fact(sigma_order);
 
                                 for(int k = 0;k < as1_order-1;k++)
@@ -299 +299 @@
 
                                         simplex->insert_gamma(k+1,local_bracket*multiplier,a_0-(*as_ref).first);
-                                        
-                                        bracket += local_bracket*fact(sigma_order-k);
+
+                                        int division_factor = 1;
+                                        for(int s = 0;s<k;s++)
+                                        {
+                                                division_factor *= k-s;
+                                        }
+                                        
+                                        bracket += local_bracket/division_factor; //local_bracket*fact(sigma_order-k);
                                 }                               
 
@@ -311 +317 @@
                         simplex->insert_gamma(0,correction_term_base,a_0);                      
 
-                        correction_term = fact(sigma_order)*correction_term_base;
+                        correction_term = correction_term_base;//fact(sigma_order)*correction_term_base;
 
                         //cout << c << int_value << endl;