Changeset 2042 for GTP

Timestamp:

01/23/07 16:11:34 (18 years ago)

Author:

bittner

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• Makefile (modified) (1 diff)
• ObjParser.cpp (modified) (3 diffs)
• SamplingStrategy.cpp (modified) (1 diff)
• preprocessor.pro (modified) (1 diff)
• run_test_arena (modified) (2 diffs)

GTP/trunk/Lib/Vis/Preprocessing/src/Makefile

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: út 23. I 01:10:24 2007
+# Generated by qmake (2.00a) (Qt 4.1.2) on: út 23. I 16:04:45 2007
 # Project:  preprocessor.pro
 # Template: app

GTP/trunk/Lib/Vis/Preprocessing/src/ObjParser.cpp

@@ -85 +85 @@
         while (pch != NULL)
         {
-                const int index = (int)strtol(pch, NULL, 10) - 1;
+          const int index = (int)strtol(pch, NULL, 10) - 1;
                                                 
-                // store vertex in hash table
-                //hashTable[index] = vertices[index];
+          // store vertex in hash table
+          //hashTable[index] = vertices[index];
+          if (index>=0)
                 indices.push_back(index);
                 
-                //if (line == 451703)
-                //      cout << index + 1 << " ";
-
-                pch = strtok(NULL, " ");
-
-                // problem: don't know how intel ray tracer tesselates
-                if ((int)indices.size() > 2)
+          //if (line == 451703)
+          //    cout << index + 1 << " ";
+          
+          pch = strtok(NULL, " ");
+          
+          // problem: don't know how intel ray tracer tesselates
+          if ((int)indices.size() > 2)
                 {
                         const int index_2 = (int)indices.size() - 2;
@@ -105 +106 @@
                                                                                   vertices[indices[index_2]],           
                                                                                   vertices[indices[index_3]]));
+                        indices.clear();
                 }
         }
@@ -253 +255 @@
                 case 'f': 
                         {
-                                //      cout << "f";
                                 if (loadMeshes)
                                 {

GTP/trunk/Lib/Vis/Preprocessing/src/SamplingStrategy.cpp

@@ -662 +662 @@
                                         if (strcmp(curr, "mutation")==0) {
                                           // temp matt: still no mutationstrategy!
-                                          //mDistributions.push_back(new MutationBasedDistribution(mPreprocessor));
+                                          mDistributions.push_back(new MutationBasedDistribution(mPreprocessor));
                                         }
         

GTP/trunk/Lib/Vis/Preprocessing/src/preprocessor.pro

@@ -1 @@
-CONFIG += release 
+CONFIG += release
 CONFIG += console warn_off thread mlrt qt
 

GTP/trunk/Lib/Vis/Preprocessing/src/run_test_arena

@@ -2 +2 @@
 
 #COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+"
-COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -preprocessor_detect_empty_viewspace- -total_samples=500000000"
+COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -preprocessor_detect_empty_viewspace+ -total_samples=500000000"
 
 
 SCENE=../data/Arena/arena-high-lods.obj
-VIEWCELLS=../data/Arena/viewcells-5000.xml
+VIEWCELLS=../data/Arena/viewcells-5000.xml.gz
 
 PREFIX=../work/plots/osp-arena1-1e5
 
-# $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
-#  -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \
-#  -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4n.xml \
-#  -preprocessor_stats=$PREFIX-i-mixed-b1-n4n.log \
-#  -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4n.hlog
+$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+ -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \
+ -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4a.xml \
+ -preprocessor_stats=$PREFIX-i-mixed-b1-n4a.log \
+ -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4a.hlog
 
 # # n - no origin mutation, q=2, reverse samples
+
+# $COMMAND -preprocessor=sampling -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+# -preprocessor_visibility_file=$PREFIX-r-reference.xml \
+# -view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-reference.log \
+# -preprocessor_histogram_file=$PREFIX-r-reference.hlog
+
+# $COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
+#  -rss_distributions=direction -view_cells_filter_max_size=1 \
+#  -preprocessor_visibility_file=$PREFIX-r-reference-global.xml \
+#  -preprocessor_stats=$PREFIX-r-reference-global.log \
+#  -preprocessor_histogram_file=$PREFIX-r-reference-global.hlog
+
+#mutation+object_direction+
+
+# BVH
+
 
 # $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
@@ -25 +41 @@
 #  -preprocessor_histogram_file=$PREFIX-i-mixed-bvh-n4n.hlog
 
-$COMMAND -preprocessor=sampling -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
--preprocessor_visibility_file=$PREFIX-r-reference.xml \
--view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-reference.log \
--preprocessor_histogram_file=$PREFIX-r-reference.hlog
-
-$COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \
- -rss_distributions=direction -view_cells_filter_max_size=1 \
- -preprocessor_visibility_file=$PREFIX-r-reference-global.xml \
- -preprocessor_stats=$PREFIX-r-reference-global.log \
- -preprocessor_histogram_file=$PREFIX-r-reference-global.hlog
-
-#mutation+object_direction+