Changeset 1242 for applications/robust

Timestamp:

10/31/10 08:59:04 (14 years ago)

Author:

sindj

Message:

Rozdelani vypoctu. JS

Files:

• applications/robust/robustlib.h (modified) (9 diffs)

applications/robust/robustlib.h

@@ -170 +170 @@
         }
 
-        void triangulate()
+        void triangulate(bool should_integrate)
         {               
                 for(list<polyhedron*>::iterator child_ref = children.begin();child_ref!=children.end();child_ref++)
                 {
+                        set<double> simplex_integrals;
+                        
                         for(list<set<vertex*>>::iterator t_ref = (*child_ref)->triangulation.begin();t_ref!=(*child_ref)->triangulation.end();t_ref++)
                         {
@@ -184 +186 @@
                                 {
                                         triangulation.push_back(new_simplex);
+
+                                        if(should_integrate)
+                                        {
+                                                toprow* as_toprow = (toprow*)this;                                              
+
+                                                vertex* base_vertex = (*new_simplex.begin());
+
+                                                double a_0 = base_vertex->get_coordinates()*as_toprow->condition(1,as_toprow->condition.size()-1)+as_toprow->condition[0];
+                                                list<double> as;
+
+                                                for(set<vertex*>::iterator vert_ref = (++new_simplex.begin()); vert_ref!=new_simplex.end();vert_ref++)
+                                                {
+                                                        vec relative_coords = (*vert_ref)->get_coordinates()-base_vertex->get_coordinates();
+
+                                                        double new_a = relative_coords*as_toprow->condition(1,as_toprow->condition.size()-1);
+
+                                                        as.push_back(new_a);
+                                                }
+
+                                                for(list<double>::iterator as_ref = as.begin();as_ref!=as.end();as_ref++)
+                                                {
+                                                        //TODO DODELAT VYPOCET!
+                                                }
+                                        }
                                 } 
+                        }
+
+                        if(should_integrate)
+                        {
+                                ((toprow*)this)->probability = 0.0;
+
+                                for(set<double>::iterator integ_ref = simplex_integrals.begin();integ_ref!=simplex_integrals.end();integ_ref++)
+                                {
+                                        ((toprow*)this)->probability += (*integ_ref);
+                                }
                         }
                 }               
@@ -245 +281 @@
         
 public:
+        double probability;
+
         /// A condition used for determining the function of a Laplace-Inverse-Gamma density resulting from Bayesian estimation
         vec condition;
 
+        int condition_order;
+
         /// Default constructor
         toprow(){};
 
         /// Constructor creating a toprow from the condition
-        toprow(vec condition)
-        {
-                this->condition = condition;
-        }
+        toprow(vec condition, int condition_order)
+        {
+                this->condition       = condition;
+                this->condition_order = condition_order;
+        }       
 
 };
@@ -587 +628 @@
                                                         else
                                                         {
+                                                                ((toprow*)current_parent)->condition_order++;
+
                                                                 if(current_parent->negativechildren.size()>0)
                                                                 {
                                                                         current_parent->set_state(-1, SPLIT);
 
-                                                                        ((toprow*)current_parent)->condition-=toadd;
+                                                                        ((toprow*)current_parent)->condition-=toadd;                                                            
+
                                                                 }
                                                                 else if(current_parent->positivechildren.size()>0)
@@ -597 +641 @@
                                                                         current_parent->set_state(1, SPLIT);
 
-                                                                        ((toprow*)current_parent)->condition+=toadd;
+                                                                        ((toprow*)current_parent)->condition+=toadd;                                                                    
                                                                 }
                                                                 else
@@ -673 +717 @@
 
         void remove_condition(vec toremove)
-        {
+        {               
                 vec null_vector = "";
 
@@ -841 +885 @@
                                         }
 
-                                        toprow* positive_poly = new toprow(((toprow*)current_polyhedron)->condition+toadd);
-                                        toprow* negative_poly = new toprow(((toprow*)current_polyhedron)->condition-toadd);
+                                        toprow* positive_poly = new toprow(((toprow*)current_polyhedron)->condition+toadd, ((toprow*)current_polyhedron)->condition_order+1);
+                                        toprow* negative_poly = new toprow(((toprow*)current_polyhedron)->condition-toadd, ((toprow*)current_polyhedron)->condition_order+1);
 
                                         for(list<polyhedron*>::iterator parent_ref = current_polyhedron->parents.begin();parent_ref!=current_polyhedron->parents.end();parent_ref++)
@@ -897 +941 @@
                                         negative_poly->vertices.insert(new_totally_neutral_child->vertices.begin(),new_totally_neutral_child->vertices.end());
 
-                                        new_totally_neutral_child->triangulate();
-
-                                        positive_poly->triangulate();
-                                        negative_poly->triangulate();
+                                        new_totally_neutral_child->triangulate(false);
+
+                                        positive_poly->triangulate(k==for_splitting.size()-1);
+                                        negative_poly->triangulate(k==for_splitting.size()-1);
 
                                         statistic.append_polyhedron(k-1, new_totally_neutral_child);
@@ -1058 +1102 @@
 
                                         // We create a new toprow with the previously specified condition.
-                                        toprow* current_copy1 = new toprow(vec1);
-                                        toprow* current_copy2 = new toprow(vec2);                                       
+                                        toprow* current_copy1 = new toprow(vec1, 0);
+                                        toprow* current_copy2 = new toprow(vec2, 0);                                    
 
                                         // The vertices of the copies will be inherited, because there will be a parent/child relation