Changeset 1280 for applications/robust/robustlib.h

Timestamp:

02/18/11 21:50:33 (13 years ago)

Author:

sindj

Message:

Oprava chyb pri vypoctech integralu - nedokonceno, ale blizim se. JS

Files:

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

applications/robust/robustlib.h

@@ -21 +21 @@
 using namespace itpp;
 
-const double max_range = 1000.0;//numeric_limits<double>::max()/10e-10;
+const double max_range = 10.0;//numeric_limits<double>::max()/10e-10;
 
 enum actions {MERGE, SPLIT};
@@ -435 +435 @@
         bool operator>(const my_ivec &second) const
         {
+                return max(*this)>max(second);
+                
+                /*
                 int size1 = this->size();
-                int size2 = second.size();
+                int size2 = second.size();              
                  
                 int counter1 = 0;
@@ -481 +484 @@
 
                         return false;
-                }
+                }*/
         }
 
@@ -487 +490 @@
         bool operator==(const my_ivec &second) const
         {
+                return max(*this)==max(second);
+                
+                /*
                 int size1 = this->size();
-                int size2 = second.size();
+                int size2 = second.size();              
                  
                 int counter = 0;
@@ -533 +539 @@
 
                         return true;
-                }
+                }*/
         }
 
@@ -796 +802 @@
         c_statistic statistic;
 
-        vector<set<my_ivec>> correction_factors;
+        vector<multiset<my_ivec>> correction_factors;
 
         int number_of_parameters;
@@ -1121 +1127 @@
         void set_correction_factors(int order)
                 {
-                        for(int remaining_order = correction_factors.size();!(remaining_order>order);remaining_order++)
-                        {
-                                set<my_ivec> factor_templates;
-                                set<my_ivec> final_factors;
-
-                                
-                                for(int i = 1;i!=number_of_parameters-order+1;i++)
+                        for(int remaining_order = correction_factors.size();remaining_order<order;remaining_order++)
+                        {
+                                multiset<my_ivec> factor_templates;
+                                multiset<my_ivec> final_factors;                                
+
+                                my_ivec orig_template = my_ivec();                              
+
+                                for(int i = 1;i<number_of_parameters-remaining_order+1;i++)
                                 {                                       
-                                        my_ivec new_template = my_ivec();
-                                        new_template.ins(0,1);
-                                        new_template.ins(1,i);
-                                        factor_templates.insert(new_template);
-
-                                        
-                                        for(int j = 1;j<remaining_order;j++)
-                                        {
+                                        bool in_cycle = false;
+                                        for(int j = 0;j<=remaining_order;j++)                                   {
                                                 
-                                                for(set<my_ivec>::iterator fac_ref = factor_templates.begin();fac_ref!=factor_templates.end();fac_ref++)
+                                                multiset<my_ivec>::iterator fac_ref = factor_templates.begin();
+
+                                                do
                                                 {
-                                                        ivec current_template = (*fac_ref);
+                                                        my_ivec current_template;
+                                                        if(!in_cycle)
+                                                        {
+                                                                current_template = orig_template;
+                                                                in_cycle = true;
+                                                        }
+                                                        else
+                                                        {
+                                                                current_template = (*fac_ref);
+                                                                fac_ref++;
+                                                        }                                                       
                                                         
-                                                        current_template[0]+=1;
                                                         current_template.ins(current_template.size(),i);
 
+                                                        cout << "template:" << current_template << endl;
                                                         
-                                                        if(current_template[0]==remaining_order)
+                                                        if(current_template.size()==remaining_order+1)
                                                         {
-                                                                final_factors.insert(current_template.right(current_template.size()-1));
+                                                                final_factors.insert(current_template);
                                                         }
                                                         else
@@ -1155 +1168 @@
                                                         }
                                                 }
+                                                while(fac_ref!=factor_templates.end());
                                         }
                                 }