Changeset 1266 for applications/robust

Timestamp:

12/16/10 18:07:35 (13 years ago)

Author:

sindj

Message:

Dodelavani vypoctu integralu v polyhedronech. JS

Location:

applications/robust

Files:

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

applications/robust/main.cpp

@@ -16 +16 @@
         
         emlig* emlig1 = new emlig(3);
+
+        emlig1->set_correction_factors(3);
 
         //emlig1->step_me(0);

applications/robust/robustlib.h

@@ -415 +415 @@
 class emlig // : eEF
 {
-        vector<set<ivec>> correction_factors;
+        
 
         /// A statistic in a form of a Hasse diagram representing a complex of convex polyhedrons obtained as a result
@@ -628 +628 @@
 public: 
 
+        vector<set<ivec>> correction_factors;
+
         int number_of_parameters;
 
@@ -924 +926 @@
         }
 
-        vector<list<ivec>> get_correction_factors(int order)
+
+        void set_correction_factors(int order)
                 {
                         for(int remaining_order = correction_factors.size();remaining_order>order;remaining_order++)
@@ -931 +934 @@
                                 set<ivec> final_factors;
 
+                                
                                 for(int i = 1;i==number_of_parameters-order+1;i++)
-                                {
-                                        for(int j = 1;j==remaining_order;j++)
-                                        {
-                                                factor_templates.insert(zeros(number_of_parameters-order+2));
-
+                                {                                       
+                                        ivec new_template = vec_2(1,i);
+                                        //new_template[0]=1;
+                                        //new_template[1]=i;
+                                        //factor_templates.insert(new_template);
+
+                                        
+                                        for(int j = 1;j==remaining_order-1;j++)
+                                        {
+                                                
                                                 for(set<ivec>::iterator fac_ref = factor_templates.begin();fac_ref!=factor_templates.end();fac_ref++)
                                                 {
                                                         ivec current_template = (*fac_ref);
-
+                                                        
                                                         current_template[0]+=1;
-                                                        current_template[i]+=1;
-
+                                                        current_template.ins(current_template.size(),i);
+
+                                                        
                                                         if(current_template[0]==remaining_order)
                                                         {
-                                                                final_factors.insert(current_template.right(current_template.size()-1);
+                                                                final_factors.insert(current_template.right(current_template.size()-1));
                                                         }
                                                         else
@@ -952 +962 @@
                                                                 factor_templates.insert(current_template);
                                                         }
-                                                }                                       
+                                                }
                                         }
                                 }       
 
-                                correction_factors.push_back(final_factors);
+                                correction_factors.push_back(final_factors);                    
 
                         }
@@ -1276 +1286 @@
 };*/
 
-
+ bool ivec::operator>(const ivec &first, const ivec &second) 
+ {
+         int size1 = first.size();
+         int size2 = second.size();
+         
+         int counter1 = 0;
+         while(0==0)
+         {
+                 if(first[counter1]==0)
+                 {
+                        size1--;
+                 }
+                
+                 if(first[counter1]!=0)
+                         break;
+         }
+
+         int counter2 = 0;
+         while(0==0)
+         {
+                 if(second[counter2]==0)
+                 {
+                        size2--;
+                 }
+                
+                 if(second[counter2]!=0)
+                         break;
+         }
+
+         if(size1!=size2)
+         {
+                return size1>size2;
+         }
+         else
+         {
+                 for(int i = 0;i<size1;i++)
+                 {
+                         if(first[counter1+i]!=second[counter2+i])
+                         {
+                                return first[counter1+i]>second[counter2+i]
+                         }
+                 }
+
+                 return false;
+         }
+ }