Changeset 1270

Timestamp:

01/07/11 18:05:28 (14 years ago)

Author:

sindj

Message:

Opravena chyba s chybejici podminkou, zbyva doresit numericke problemy. JS

Location:

applications/robust

Files:

• robustlib.cpp (modified) (2 diffs)
• robustlib.h (modified) (5 diffs)

applications/robust/robustlib.cpp

@@ -19 +19 @@
 
                                         int condition_order = ((toprow*)this)->condition_order-1;
+
+                                        // cout << "C:" << condition_order << "  N:" << my_emlig->number_of_parameters << "  C+N:" << condition_order-my_emlig->number_of_parameters << endl;
+                                        // pause(0.1);
                                         if(should_integrate && condition_order-my_emlig->number_of_parameters >= 0)
                                         {
@@ -128 +131 @@
                                                 }
 
+                                                cout << int_value << endl;
+                                                pause(0.1);
+
+
                                                 simplex_integrals.insert(int_value);
                                         }

applications/robust/robustlib.h

@@ -19 +19 @@
 using namespace itpp;
 
-const double max_range = 99999999.0;//numeric_limits<double>::max()/10e-10;
+const double max_range = 1000.0;//numeric_limits<double>::max()/10e-10;
 
 enum actions {MERGE, SPLIT};
@@ -726 +726 @@
                                                         else
                                                         {
+                                                                ((toprow*)current_parent)->condition_order++;
+
                                                                 if(current_parent->negativechildren.size()>0)
                                                                 {
@@ -736 +738 @@
                                                                         current_parent->set_state(1, SPLIT);
 
-                                                                        ((toprow*)current_parent)->condition+=toadd;
+                                                                        ((toprow*)current_parent)->condition+=toadd;                                                                    
                                                                 }
                                                                 else
@@ -966 +968 @@
                                         else
                                         {
-                                                toprow* neutral_toprow = new toprow();                                          
+                                                toprow* neutral_toprow = new toprow();
+
+                                                neutral_toprow->condition       = zeros(number_of_parameters+1);
+                                                neutral_toprow->condition_order = ((toprow*)current_polyhedron)->condition_order+1;
 
                                                 new_totally_neutral_child = neutral_toprow;
@@ -984 +989 @@
                                         }
 
-                                        cout << ((toprow*)current_polyhedron)->condition << endl << toadd << endl;
+                                        // cout << ((toprow*)current_polyhedron)->condition << endl << toadd << endl;
 
                                         toprow* positive_poly = new toprow(((toprow*)current_polyhedron)->condition+toadd, ((toprow*)current_polyhedron)->condition_order+1);