Changeset 1299 for applications/robust/main.cpp

Timestamp:

03/16/11 17:20:48 (13 years ago)

Author:

sindj

Message:

Skoro dodelano slucovani polyhedronu v pripade odstraneni podminky (bylo nutne udelat znovu, kvuli predchozi ztrate prace zpusebene budto SVN nebo mnou). JS

Files:

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

applications/robust/main.cpp

@@ -19 +19 @@
 
 int main ( int argc, char* argv[] ) {
-        
-        
         
         
@@ -85 +83 @@
                                         emliga->add_condition(conditions[k-3]);
 
-                                        /*
-                                        if(k>5)
-                                        {
-                                                cout << "MaxLik coords:" << emliga->minimal_vertex->get_coordinates() << endl;
-                                        }
-                                        */
-                                }
+                                        
+                                        //if(k>5)
+                                        //{
+                                        //      cout << "MaxLik coords:" << emliga->minimal_vertex->get_coordinates() << endl;
+                                        //}
+                                        
+                                }                               
+                                
                         }
 
@@ -119 +118 @@
                 myfile.close();
         }
-
-        
-
-        //emlig* emlig1 = new emlig(emlig_size);
+    
+
+        // emlig* emlig1 = new emlig(emlig_size);
+        // emlig* emlig2 = new emlig(emlig_size);
         
         /*
@@ -142 +141 @@
         }*/
         
-    /*
+        /*
+    vec condition5 = "-0.3 1.7 1.5";
+        emlig1->add_condition(condition5);
+        
         vec condition1 = "1.0 1.0 1.01";
         emlig1->add_condition(condition1);
+        emlig2->add_condition(condition1);
 
         vec condition2 = "-1.0 1.0 1.0";
         emlig1->add_condition(condition2);
+        emlig2->add_condition(condition2);
 
         vec condition3 = "0.5 -1.01 1.0";
         emlig1->add_condition(condition3);
+        emlig2->add_condition(condition3);
+        
 
         vec condition4 = "-0.5 -1.0 1.0";
         emlig1->add_condition(condition4);
-
-        cout << emlig1->minimal_vertex->get_coordinates();
-
-        //vec condition5 = "-0.3 1.7 1.5";
-        //emlig1->add_condition(condition5);
+        cout << "************************************************" << endl;
+        emlig2->add_condition(condition4);
+        cout << "************************************************" << endl;
+
+        //cout << emlig1->minimal_vertex->get_coordinates();
+
+        emlig1->remove_condition(condition5);
+        cout << "************************************************" << endl;
+        
+        //emlig1->step_me(0);
+        //emlig2->step_me(0);
+        
 
         // DA SE POUZIT PRO VYPIS DO SOUBORU