Ignore:
Timestamp:
05/03/07 23:23:31 (18 years ago)
Author:
mattausch
Message:

fixed new evaluation method

Location:
GTP/trunk/Lib/Vis/Preprocessing/scripts
Files:
2 edited

Legend:

Unmodified
Added
Removed

  • GTP/trunk/Lib/Vis/Preprocessing/scripts/gi_final.env

    r2255 r2350  
    173173        } 
    174174 
    175         #showVisualization true 
    176         showVisualization false 
     175        showVisualization true 
     176        #showVisualization false 
    177177        #evaluateViewCells false 
    178178        evaluateViewCells true 
    179179         
    180180        Evaluation { 
    181                 samples         100000000 
    182                 samplesForStats 100000000 
    183                 #samples          10000000 
    184                 #samplesForStats  10000000 
     181                samples         6000000 
     182                samplesForStats 2000000 
    185183 
    186184                samplesPerPass  500000 
    … …  
    233231        Construction {           
    234232                renderCostDecreaseWeight 0.999 
     233#               renderCostDecreaseWeight 1.0 
    235234        } 
    236235 
    … …  
    265264        Construction { 
    266265 
    267                 samples 6000000 
     266                samples 100000 
    268267 
    269268                # type 0 = sequential computation, 1 = interleaved, 2 = gradient 
    … …  
    280279                # minimal steps of same type: for interleaved, this is only valid for the first few splits 
    281280                minStepsOfSameType 100 
    282                 #maxStepsOfSameType 3000 
    283281                maxStepsOfSameType 900 
    284282 
    … …  
    288286        Termination { 
    289287                # maximal number of leaves 
    290                 maxLeaves 300000 
    291 #               maxLeaves 6000 
     288                maxLeaves 10000 
    292289                # maximal memory in MB 
    293290#               maxMemory 4 
    294                 maxMemory 35 
     291                maxMemory 25 
    295292                # minimum ratio of global cost decrease 
    296293                minGlobalCostRatio -1 

  • GTP/trunk/Lib/Vis/Preprocessing/scripts/gi_final.sh

    r2309 r2350  
    77TARGET=release 
    88 
    9 PROGRAM=../bin/$TARGET/Preprocessor.exe 
     9PROGRAM=../bin/$TARGET/Preprocessor2.exe 
     10#PROGRAM=../bin/$TARGET/Preprocessor_old.exe 
     11#PROGRAM=../bin/$TARGET/Preprocessor_itl.exe 
    1012 
    1113EXT=obj 
    12 #SCENE=vienna_cropped 
    13 #SCENE_PATH=../data/vienna 
     14SCENE=vienna_cropped 
     15SCENE_PATH=../data/vienna 
    1416 
    1517#SCENE=arena-high-lods 
    1618#SCENE_PATH=../data/Arena 
    1719 
    18 SCENE=PompeiiOne 
    19 SCENE_PATH=../data/Pompeii 
     20SCENE=soda 
     21SCENE_PATH=../data/soda 
    2022 
    2123ENVIRONMENT=gi_final.env 
    22  
    23 LOG_PREFIX=../scripts/tests/gi/$SCENE-speed 
     24LOG_PREFIX=../scripts/tests/gi/$SCENE-test 
    2425 
    2526echo "starting $TARGET mode for $SCENE scene ($PROGRAM)" 
    … …  
    2930####################################################### 
    3031 
    31 USE_HEUR=true 
    32  METHOD=int 
    33  echo "$SCENE $METHOD" 
     32USE_HEUR=false 
     33METHOD=int-$USE_HEUR 
    3434 
    35  
     35echo "$SCENE $METHOD" 
    3636$PROGRAM $ENVIRONMENT \ 
    3737  -scene_filename=$SCENE_FILENAME \ 
    … …  
    4040  -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
    4141  -view_cells_filename=$LOG_PREFIX-$METHOD-viewcells.xml.gz \ 
     42  -view_cells_triangle_weight=1.0 \ 
     43  -view_cells_object_weight=0.0 \ 
    4244  -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 
    4345  -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 
    … …  
    4648  -hierarchy_construction_min_avg_rays_per_object=0 \ 
    4749  -hierarchy_construction_max_avg_rays_per_object=0 \ 
    48   -bvh_use_sah=false \ 
     50  -bvh_use_sah=true \ 
    4951  -vsp_use_cost_heuristics=$USE_HEUR 
    5052 
    5153sh movefiles.sh $LOG_PREFIX-$METHOD 
    5254 
    53 ####################################################### 
    5455 
    55 USE_HEUR=true 
    56  METHOD=int-2 
    57  echo "$SCENE $METHOD" 
    58  
    59  
    60 $PROGRAM $ENVIRONMENT \ 
    61   -scene_filename=$SCENE_FILENAME \ 
    62   -view_cells_sampling_type=object_directional \ 
    63   -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
    64   -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
    65   -view_cells_filename=$LOG_PREFIX-$METHOD-viewcells.xml.gz \ 
    66   -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 
    67   -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 
    68   -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \ 
    69   -hierarchy_construction_type=2 \ 
    70   -hierarchy_construction_min_avg_rays_per_object=1 \ 
    71   -hierarchy_construction_max_avg_rays_per_object=10 \ 
    72   -bvh_use_sah=false \ 
    73   -vsp_use_cost_heuristics=$USE_HEUR 
    74  
    75 sh movefiles.sh $LOG_PREFIX-$METHOD 
    7656 
    7757####################################################### 
    7858 
    7959NODES=60000 
    80 #NODES=5000 
    81 USE_HEUR=true 
    82 #USE_HEUR=false 
    83    
    84 METHOD=seq-$NODES 
    85 echo "$SCENE $METHOD" 
     60USE_HEUR=false 
     61METHOD=seq-$NODES-$USE_HEUR 
     62  
     63#echo "$SCENE $METHOD" 
     64# $PROGRAM $ENVIRONMENT \ 
     65 -scene_filename=$SCENE_FILENAME \ 
     66 -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
     67 -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
     68 -view_cells_filename=$LOG_PREFIX-$METHOD-viewcells.xml.gz \ 
     69 -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 
     70 -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 
     71 -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \ 
     72 -hierarchy_construction_type=0 \ 
     73 -view_cells_triangle_weight=1.0 \ 
     74 -view_cells_object_weight=50.0 \ 
     75 -vsp_use_cost_heuristics=$USE_HEUR \ 
     76 -bvh_term_max_leaves=$NODES 
    8677 
    87 $PROGRAM $ENVIRONMENT \ 
    88   -scene_filename=$SCENE_FILENAME \ 
    89   -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
    90   -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
    91   -view_cells_filename=$LOG_PREFIX-$METHOD-viewcells.xml.gz \ 
    92   -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 
    93   -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 
    94   -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \ 
    95   -hierarchy_construction_type=0 \ 
    96   -hierarchy_construction_consider_memory=false \ 
    97   -vsp_use_cost_heuristics=$USE_HEUR \ 
    98   -bvh_term_max_leaves=$NODES 
     78#sh movefiles.sh $LOG_PREFIX-$METHOD 
    9979 
    100 sh movefiles.sh $LOG_PREFIX-$METHOD 
    101  
    102  
    103 ####################################################### 
    104  
    105 NODES=10000 
    106 USE_HEUR=true 
    107 #USE_HEUR=false 
    108    
    109 METHOD=seq-$NODES 
    110 echo "$SCENE $METHOD" 
    111  
    112 $PROGRAM $ENVIRONMENT \ 
    113   -scene_filename=$SCENE_FILENAME \ 
    114   -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
    115   -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
    116   -view_cells_filename=$LOG_PREFIX-$METHOD-viewcells.xml.gz \ 
    117   -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 
    118   -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 
    119   -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \ 
    120   -hierarchy_construction_type=0 \ 
    121   -hierarchy_construction_consider_memory=false \ 
    122   -vsp_use_cost_heuristics=$USE_HEUR \ 
    123   -bvh_term_max_leaves=$NODES 
    124  
    125 sh movefiles.sh $LOG_PREFIX-$METHOD 
Note: See TracChangeset for help on using the changeset viewer.