Changeset 1383 for applications/robust/robustlib.cpp

Timestamp:

08/18/11 16:02:53 (13 years ago)

Author:

sindj

Message:

Program update, kontrola vypoctu provedena, integruje spravne v nedegenerovanem pripade. JS

Files:

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

applications/robust/robustlib.cpp

@@ -143 +143 @@
                                 extended_coords.ins(0,-1);
 
+                                cout << "Ext. coords:" << extended_coords << "Condition sum:" << as_toprow->condition_sum << endl;
+
                                 double a = extended_coords*as_toprow->condition_sum;
                                 if(a<current_emlig->min_ll)
@@ -152 +154 @@
                                 //cout << "a0:" << a_0 << " a0 coords:" << base_vertex->get_coordinates() << " am:" << a_m << " am coords:" << (*vert_ref)->get_coordinates() << endl;
 
-                                // cout << "Absolute coords:(V"  << row_count << ")" << (*vert_ref)->get_coordinates() << endl;
+                                cout << "Absolute coords:(V"  << row_count << ")" << (*vert_ref)->get_coordinates() << endl;
                                 //cout << "Relative coords:(V"  << row_count << ")" << relative_coords << endl;
 
@@ -209 +211 @@
                                                                                 
                                         if(k!=0)
-                                        {                                               
+                                        {       
+                                                double value = 0;
                                                 ivec control_vec = ivec();
                                                 control_vec.ins(0,my_emlig->number_of_parameters-a_order+1);                                            
@@ -223 +226 @@
                                                         }
                                                                                                         
-                                                        double value = bracket_factor*factor_multiplier*k_multiplier;
-
-                                                        simplex->insert_gamma(k,value,(*a_ref).first);
-                                                        gamma_facs[k] += value;
+                                                        value += bracket_factor*factor_multiplier*k_multiplier;                                                 
                                                 }
+
+                                                simplex->insert_gamma(k,value,(*a_ref).first);
+                                                gamma_facs[k] += value;
                                         }
                                         else
@@ -234 +237 @@
                                                 
                                                 simplex->insert_gamma(0,value,(*a_ref).first);
-                                                gamma_facs[k] += value;
+                                                gamma_facs[0] += value;
                                         }                                               
                                 }                               
@@ -254 +257 @@
                         
                         simplex->probability = int_value;
-                        //cout << "Probability:" << int_value << endl;
+                        cout << "Probability:" << int_value << endl;
                         return int_value;               
                 }