Changeset 1300 for applications/robust/main.cpp

Timestamp:

03/18/11 17:59:56 (15 years ago)

Author:

sindj

Message:

Dalsi update merge polyhedronu. Rozhodovani o prislusnosti k podmince predelano z urcovani podle souradnic na urcovani podle materskych podminek (nedodelano - je treba dodelat progresovani podminek).JS

Files:

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

applications/robust/main.cpp

@@ -20 +20 @@
 int main ( int argc, char* argv[] ) {
         
-        
+        /*
         vector<vector<vector<string>>> string_lists;
         string_lists.push_back(vector<vector<string>>());
@@ -55 +55 @@
         for(int j = 0;j<string_lists.size();j++)
         { 
-                
+                /*
                 for(int i = 0;i<string_lists[j].size()-1;i++)
                 {
@@ -118 +118 @@
                 myfile.close();
         }
-    
-
-        // emlig* emlig1 = new emlig(emlig_size);
-        // emlig* emlig2 = new emlig(emlig_size);
+    */
+        
+        
+        emlig* emlig1 = new emlig(emlig_size);
+        emlig* emlig2 = new emlig(emlig_size);
         
         /*
@@ -141 +142 @@
         }*/
         
-        /*
-    vec condition5 = "-0.3 1.7 1.5";
+        
+    vec condition5 = "1.0 1.0 1.01";//"-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 << "************************************************" << endl;
-        emlig2->add_condition(condition4);
-        cout << "************************************************" << endl;
-
+        //vec condition1a = "1.0 1.0 1.01";
+        //vec condition1b = "1.0 1.0 1.01";
+        //emlig1->add_condition(condition1a);
+        //emlig2->add_condition(condition1b);
+
+        //vec condition2a = "-1.0 1.0 1.0";
+        //vec condition2b = "-1.0 1.0 1.0";
+        //emlig1->add_condition(condition2a);
+        //emlig2->add_condition(condition2b);
+
+        //vec condition3a = "0.5 -1.01 1.0";
+        //vec condition3b = "0.5 -1.01 1.0";
+
+        //emlig1->add_condition(condition3a);
+        //emlig2->add_condition(condition3b);   
+
+        //vec condition4a = "-0.5 -1.0 1.0";
+        //vec condition4b = "-0.5 -1.0 1.0";    
+
+        //emlig1->add_condition(condition4a);
+        //cout << "************************************************" << endl;
+        //emlig2->add_condition(condition4b);
+        //cout << "************************************************" << endl;
+        
         //cout << emlig1->minimal_vertex->get_coordinates();
-
+        
         emlig1->remove_condition(condition5);
-        cout << "************************************************" << endl;
-        
+
         //emlig1->step_me(0);
         //emlig2->step_me(0);