Changeset 1366 for applications/robust/robustlib.cpp

Timestamp:

05/10/11 18:59:52 (13 years ago)

Author:

sindj

Message:

Jupiijahou, snad se podarilo dobojovat s normalizacnim faktorem. Pridany vsechny potrebne logaritmy do log_nc. JS

Files:

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

applications/robust/robustlib.cpp

@@ -145 +145 @@
                                 base_vertex = (*base_ref);
                         
-                                //cout << "Base coords: " << base_vertex->get_coordinates() << endl;
-                                //cout << "Condition: " << as_toprow->condition_sum << endl;
-                                //pause(0.1);
+                                /*
+                                cout << "Base coords: " << base_vertex->get_coordinates() << endl;
+                                cout << "Condition: " << as_toprow->condition_sum << endl;
+                                pause(0.1);
+                                */
 
                                 a_0 = -base_vertex->get_coordinates()*cur_condition+as_toprow->condition_sum[0];                
@@ -272 +274 @@
                                 }       
 
-                                double gamma_multiplier = -(*as_ref).first-a_0;
-
-                                double bracket = fact(as1_order-1)/pow(gamma_multiplier,sigma_order+1);
+                                double cur_as_ref = (*as_ref).first;                            
+
+                                double gamma_multiplier = -cur_as_ref-a_0;
+
+                                double bracket = fact(as1_order-1)/pow(gamma_multiplier,sigma_order);
                                                                 
                                 simplex->insert_gamma(0,bracket*multiplier,gamma_multiplier);                                                           
@@ -283 +287 @@
                                 {
                                         double local_bracket = 0;
-                                        double bracket_factor = 1/fact(as1_order-1-k)/pow(gamma_multiplier,sigma_order-k);//pow((double)-1,k+1)
+                                        double bracket_factor = 1/fact(as1_order-1-k)/pow(gamma_multiplier,sigma_order-k-1);//pow((double)-1,k+1)
                                         
                                         ivec control_vec = ivec();
@@ -318 +322 @@
                         }
 
-                        double correction_term_base = correction_term/pow(-a_0,sigma_order+1);
+                        double correction_term_base = correction_term/pow(-a_0,sigma_order);
 
                         simplex->insert_gamma(0,correction_term_base,-a_0);