Changeset 1362 for applications/robust/robustlib.cpp

Timestamp:

05/09/11 19:07:15 (13 years ago)

Author:

sindj

Message:

Pridani soft apriorna, boj s integraly. JS

Files:

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

applications/robust/robustlib.cpp

@@ -96 +96 @@
         {
                 // cout << ((toprow*)this)->condition << endl;          
-
-                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;
+                int sigma_order = ((toprow*)this)->condition_order-simplex->vertices.size()-1;
 
                 // cout << "C:" << condition_order << "  N:" << my_emlig->number_of_parameters << "  C+N:" << condition_order-my_emlig->number_of_parameters << endl;
@@ -147 +144 @@
 
                                 base_vertex = (*base_ref);
-
-                        
-                                // cout << endl << "Base coords:" << base_vertex->get_coordinates() << endl;
+                        
+                                //cout << "Base coords: " << base_vertex->get_coordinates() << endl;
+                                //cout << "Condition: " << as_toprow->condition_sum << endl;
+                                //pause(10);
 
                                 a_0 = base_vertex->get_coordinates()*cur_condition-as_toprow->condition_sum[0];
@@ -340 +338 @@
                 else
                 {
+                        cout << "Improper probability density." << endl;
                         return 0.0;
                 }