Changeset 1219

Timestamp:

10/20/10 13:48:34 (14 years ago)

Author:

sindj

Message:

Dodelani deleni - uz funguje. Je treba jeste dodelat predavani vrcholu a triangulaci a vypocet integralu v jednotlivych polyhedronech. Pak uz slucovani. JS

Location:

applications/robust

Files:

• main.cpp (modified) (3 diffs)
• robustlib.h (modified) (6 diffs)

applications/robust/main.cpp

@@ -15 +15 @@
 int main ( int argc, char* argv[] ) {
         
-        emlig* emlig1 = new emlig(3);
+        emlig* emlig1 = new emlig(3);   
 
-        emlig1->step_me();
+        for(int i = 0;i<500;i++)
+        {
+                double condition[4];            
 
-        vec condition = "3.0 -5.0 -3.0 -2.0";   
+                condition[0] = rand()/1000.0;
+                condition[1] = rand()/1000.0;
+                condition[2] = rand()/1000.0;
+                condition[3] = rand()/1000.0;
+
+                vec* condition_vec = new vec(condition,4);
+                emlig1->add_condition(*condition_vec);
+
+                // emlig1->step_me(i);
+                
+                vector<int> sizevector;
+                for(int s = 0;s<=emlig1->number_of_parameters;s++)
+                {
+                        sizevector.push_back(emlig1->statistic_rowsize(s));
+                }
+        }
+
+
+        
+        /*
+        emlig1->step_me(1);
+
+        vec condition = "2.0 0.0 1.0";  
 
         emlig1->add_condition(condition);
@@ -29 +53 @@
         }
 
-        emlig1->step_me();
+        emlig1->step_me(2);
 
-        condition = "-5.0 2.3 2.3 -1.0";
+        condition = "2.0 1.0 0.0";
 
         emlig1->add_condition(condition);
@@ -40 +64 @@
                 sizevector.push_back(emlig1->statistic_rowsize(s));
         }
+        */
 
         return 0;

applications/robust/robustlib.h

@@ -497 +497 @@
                                                 {
                                                 case 1:
-                                                        current_parent->positivechildren.push_back(sender);     
+                                                        current_parent->positivechildren.push_back(sender);                                                     
                                                 break;
                                                 case 0:
-                                                        current_parent->neutralchildren.push_back(sender);
+                                                        current_parent->neutralchildren.push_back(sender);                                                      
 
                                                         if(current_parent->totally_neutral == NULL)
@@ -518 +518 @@
                                                 break;
                                                 case -1:
-                                                        current_parent->negativechildren.push_back(sender);
+                                                        current_parent->negativechildren.push_back(sender);                                                     
                                                 break;
                                                 }
@@ -560 +560 @@
                                                                 current_parent->totally_neutral = NULL;
                                                                 current_parent->kids_rel_addresses.clear();
-                                                                //current_parent->set_state(0, SPLIT);
+                                                                current_parent->message_counter = 0;
                                                         }
                                                 }
@@ -595 +595 @@
         }
 
-        void step_me()
+        void step_me(int marker)
         {
                 for(int i = 0;i<statistic.size();i++)
@@ -778 +778 @@
                                                                                                                                 current_polyhedron->totallyneutralgrandchildren.end());
 
+                                        for(list<polyhedron*>::iterator grand_ref = current_polyhedron->totallyneutralgrandchildren.begin(); grand_ref != current_polyhedron->totallyneutralgrandchildren.end();grand_ref++)
+                                        {
+                                                (*grand_ref)->parents.push_back(new_totally_neutral_child);
+                                        }
+
                                         toprow* positive_poly = new toprow(((toprow*)current_polyhedron)->condition+toadd);
                                         toprow* negative_poly = new toprow(((toprow*)current_polyhedron)->condition-toadd);
@@ -786 +791 @@
 
                                                 (*parent_ref)->neutralchildren.remove(current_polyhedron);
+                                                (*parent_ref)->children.remove(current_polyhedron);
+
+                                                (*parent_ref)->children.push_back(positive_poly);
+                                                (*parent_ref)->children.push_back(negative_poly);
                                                 (*parent_ref)->positivechildren.push_back(positive_poly);
                                                 (*parent_ref)->negativechildren.push_back(negative_poly);