Changeset 1269 for applications/robust

Timestamp:

01/07/11 10:09:42 (13 years ago)

Author:

sindj

Message:

Oprava faktorialu zapornych cisel ve vypoctu integralu v triangulaci. Zbyva opravit nenaplneni podminky v nekterych toprow polyhedronech. JS

Location:

applications/robust

Files:

• main.cpp (modified) (1 diff)
• robustlib.cpp (modified) (3 diffs)
• robustlib.h (modified) (4 diffs)

applications/robust/main.cpp

@@ -13 +13 @@
 using namespace bdm;
 
-const int emlig_size = 3;
+const int emlig_size = 2;
 
 int main ( int argc, char* argv[] ) {

applications/robust/robustlib.cpp

@@ -18 +18 @@
                                         triangulation.push_back(new_simplex);
 
-                                        if(should_integrate)
+                                        int condition_order = ((toprow*)this)->condition_order-1;
+                                        if(should_integrate && condition_order-my_emlig->number_of_parameters >= 0)
                                         {
                                                 emlig* current_emlig;
@@ -67 +68 @@
                                                 for(map<double,int>::iterator as_ref = as.begin();as_ref!=as.end();as_ref++)
                                                 {
-                                                        int condition_order = ((toprow*)this)->condition_order-1;
-
                                                         double multiplier = det_jacobian;
                                                         if(a_0!=(*as_ref).first)
@@ -100 +99 @@
                                                                 }
 
-                                                                double bracket = fact(condition_order-1-number_of_factors)/fact(as1_order-1)/*/pow((*as_ref).first-a_0,condition_order-1-number_of_factors)*/;
+                                                                double facti = fact(0);
+
+                                                                double bracket = fact(condition_order-number_of_factors)/fact(as1_order-1)/pow((*as_ref).first-a_0,condition_order-number_of_factors);
                                                                 for(int k = 0;k < as1_order-1;k++)
                                                                 {
-                                                                        double bracket_factor = pow((double)-1,k+1)*fact(condition_order-2-number_of_factors-k)/fact(as1_order-2-k)/pow((*as_ref).first-a_0,condition_order-2-number_of_factors-k);
+                                                                        double bracket_factor = pow((double)-1,k+1)*fact(condition_order-1-number_of_factors-k)/fact(as1_order-2-k)/pow((*as_ref).first-a_0,condition_order-1-number_of_factors-k);
                                                                         
                                                                         for(set<my_ivec>::iterator combi_ref = this->my_emlig->correction_factors[k].begin();combi_ref!=this->my_emlig->correction_factors[k].end();combi_ref++)

applications/robust/robustlib.h

@@ -960 +960 @@
                                                 vec new_coordinates = coordinates1*t+(coordinates2(1,coordinates2.size()-1)-coordinates1);                                      
 
-                                                vertex* neutral_vertex = new vertex(new_coordinates);
-
-                                                neutral_vertex->my_emlig = this;
+                                                vertex* neutral_vertex = new vertex(new_coordinates);                                           
 
                                                 new_totally_neutral_child = neutral_vertex;
@@ -968 +966 @@
                                         else
                                         {
-                                                toprow* neutral_toprow = new toprow();
-
-                                                neutral_toprow->my_emlig = this;
+                                                toprow* neutral_toprow = new toprow();                                          
 
                                                 new_totally_neutral_child = neutral_toprow;
                                         }
+
+                                        new_totally_neutral_child->my_emlig = this;
                                         
                                         new_totally_neutral_child->children.insert(new_totally_neutral_child->children.end(),
@@ -985 +983 @@
                                                 new_totally_neutral_child->vertices.insert((*grand_ref)->vertices.begin(),(*grand_ref)->vertices.end());
                                         }
+
+                                        cout << ((toprow*)current_polyhedron)->condition << endl << toadd << endl;
 
                                         toprow* positive_poly = new toprow(((toprow*)current_polyhedron)->condition+toadd, ((toprow*)current_polyhedron)->condition_order+1);
@@ -1071 +1071 @@
                 }
 
-                
-        }
-
+                /*
+                for(polyhedron* topr_ref = statistic.rows[statistic.size()-1];topr_ref!=statistic.row_ends[statistic.size()-1]->next_poly;topr_ref=topr_ref->next_poly)
+                {
+                        cout << ((toprow*)topr_ref)->condition << endl;
+                }
+                */
+
+        }
 
         void set_correction_factors(int order)