Changeset 1268 for applications/robust/main.cpp

Timestamp:

01/05/11 18:01:55 (13 years ago)

Author:

sindj

Message:

Dodelani vypoctu pri degenerovanych podminkach. Zda se, ze docela funguje, ale neni zohlednena pocatecni divergence integralu aposteriorna pres parametry. Zbyva odladit. JS

Files:

• applications/robust/main.cpp (modified) (4 diffs)

applications/robust/main.cpp

@@ -13 +13 @@
 using namespace bdm;
 
+const int emlig_size = 3;
+
 int main ( int argc, char* argv[] ) {
         
-        emlig* emlig1 = new emlig(4);
 
+        emlig* emlig1 = new emlig(emlig_size);
+        
         /*
         emlig1->set_correction_factors(4);
@@ -24 +27 @@
                 for(set<my_ivec>::iterator vec_ref = emlig1->correction_factors[j].begin();vec_ref!=emlig1->correction_factors[j].end();vec_ref++)
                 {
+                        cout << j << "    ";
+                        
                         for(int i=0;i<(*vec_ref).size();i++)
                         {
@@ -31 +36 @@
                         cout << endl;
                 }
-        }
-        */
+        }*/
+        
 
         //emlig1->step_me(0);
@@ -40 +45 @@
                 cout << "Step:" << i << endl;
 
-                double condition[4];            
+                double condition[emlig_size+1];         
 
-                condition[0] = rand()/1000.0;
-                condition[1] = rand()/1000.0;
-                condition[2] = rand()/1000.0;
-                condition[3] = rand()/1000.0;
-                /*condition[4] = rand()/1000.0;
-                condition[5] = rand()/1000.0;
-                condition[6] = rand()/1000.0;
-                condition[7] = rand()/1000.0;
-                condition[8] = rand()/1000.0;*/
-                
+                for(int k = 0;k<=emlig_size;k++)
+                {
+                        condition[k] = rand()/1000.0;           
+                }
+                        
 
-                vec* condition_vec = new vec(condition,4);
+                vec* condition_vec = new vec(condition,emlig_size+1);
                 emlig1->add_condition(*condition_vec);
+        
 
                 emlig1->step_me(i);