Changeset 1660


Ignore:
Timestamp:
10/20/06 18:08:38 (18 years ago)
Author:
mattausch
Message:

added ratio for rc / storage

Location:
GTP/trunk/Lib/Vis/Preprocessing
Files:
5 edited

Legend:

Unmodified
Added
Removed

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

    r1658 r1660  
    1313#SCENE=vsposp_typical 
    1414#SCENE=soda5_vsposp 
    15 #SCENE=soda_vsposp 
     15SCENE=soda_vsposp 
    1616#SCENE=vienna_vsposp 
    17 SCENE=vsposp_citymodel 
     17#SCENE=arena_vsposp 
     18#SCENE=vsposp_citymodel 
    1819#SCENE=soda5 
    1920#SCENE=cube 
    … …  
    6364 echo "$SCENE $METHOD" 
    6465 
    65 # $PROGRAM $ENVIRONMENT \ 
    66 # -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
    67 # -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
    68 # -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 
    69 # -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 
    70 # -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \ 
    71 # -hierarchy_construction_type=2 \ 
    72 # -hierarchy_construction_recompute_split_on_repair=true 
     66  $PROGRAM $ENVIRONMENT \ 
     67  -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
     68  -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
     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=2 \ 
     73  -hierarchy_construction_multilevel=false \ 
     74  -hierarchy_construction_recompute_split_on_repair=true 
    7375 
    7476sh movefiles.sh $LOG_PREFIX-$METHOD 
    … …  
    7779############################################################################ 
    7880NODES=1000 
    79  
    80   METHOD=sequential-$NODES 
    81   echo "$SCENE $METHOD" 
    82  
    83 # $PROGRAM $ENVIRONMENT \ 
    84 #  -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
    85 #  -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
    86 #  -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 
    87 #  -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 
    88 #  -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \ 
    89 #  -hierarchy_construction_type=0 \ 
    90 #  -bvh_term_max_leaves=$NODES 
    91  
    92 sh movefiles.sh $LOG_PREFIX-$METHOD 
    93  
    94 ############################################################################ 
    95  
    96 NODES=10000 
    97  
    98   METHOD=sequential-$NODES 
    99   echo "$SCENE $METHOD" 
    100  
    101 # $PROGRAM $ENVIRONMENT \ 
    102 #  -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
    103 #  -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
    104 #  -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 
    105  # -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 
    106  # -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \ 
    107  # -hierarchy_construction_type=0 \ 
    108 #  -bvh_term_max_leaves=$NODES 
    109  
    110 sh movefiles.sh $LOG_PREFIX-$METHOD 
    111  
    112  
    113 ############################################################################ 
    114  
    115 NODES=30000 
    11681 
    11782  METHOD=sequential-$NODES 
    … …  
    12691  -hierarchy_construction_type=0 \ 
    12792  -bvh_term_max_leaves=$NODES 
     93 
     94sh movefiles.sh $LOG_PREFIX-$METHOD 
     95 
     96############################################################################ 
     97 
     98NODES=10000 
     99 
     100  METHOD=sequential-$NODES 
     101  echo "$SCENE $METHOD" 
     102 
     103 $PROGRAM $ENVIRONMENT \ 
     104  -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
     105  -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
     106  -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 
     107  -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 
     108  -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \ 
     109  -hierarchy_construction_type=0 \ 
     110  -bvh_term_max_leaves=$NODES 
     111 
     112sh movefiles.sh $LOG_PREFIX-$METHOD 
     113 
     114 
     115############################################################################ 
     116 
     117NODES=30000 
     118 
     119  METHOD=sequential-$NODES 
     120  echo "$SCENE $METHOD" 
     121 
     122#  $PROGRAM $ENVIRONMENT \ 
     123#   -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
     124#   -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
     125#   -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 
     126#   -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 
     127#   -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \ 
     128#   -hierarchy_construction_type=0 \ 
     129#   -bvh_term_max_leaves=$NODES 
    128130 
    129131sh movefiles.sh $LOG_PREFIX-$METHOD 
    … …  
    147149 
    148150sh movefiles.sh $LOG_PREFIX-$METHOD 
     151 
     152############################################################### 
     153 
     154# METHOD=gradient-multi 
     155# echo "$SCENE $METHOD" 
     156 
     157# $PROGRAM $ENVIRONMENT \ 
     158# -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 
     159# -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 
     160# -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 
     161 #-bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 
     162# -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \ 
     163# -hierarchy_construction_type=2 \ 
     164# -hierarchy_construction_multilevel=true \ 
     165# -hierarchy_construction_levels=4 \ 
     166# -hierarchy_construction_recompute_split_on_repair=true 
     167 
     168sh movefiles.sh $LOG_PREFIX-$METHOD 

  • GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp

    r1654 r1660  
    272272                        << "#TotalRenderCost\n" << totalRenderCost << endl 
    273273                        << "#Memory\n" << memory << endl 
    274                         << "#RcPerMb\n" << renderCostPerStorage << endl 
     274                        << "#FpsPerMb\n" << renderCostPerStorage << endl 
    275275                        << "#VspOspRatio\n" << vspOspRatio << endl; 
    276276} 
    … …  
    417417        while (!(viewSpaceQueue.Empty() && objectSpaceQueue.Empty())) 
    418418        { 
    419                 const float vspPriority = viewSpaceQueue.Empty() ? 0 : viewSpaceQueue.Top()->GetPriority(); 
    420                 const float ospPriority = objectSpaceQueue.Empty() ? 0 : objectSpaceQueue.Top()->GetPriority(); 
     419                const float vspPriority = viewSpaceQueue.Empty() ? 0 :  
     420                        viewSpaceQueue.Top()->GetPriority() / ((float)viewSpaceQueue.Top()->GetPvsEntriesIncr() + Limits::Small); 
     421                const float ospPriority = objectSpaceQueue.Empty() ? 0 :  
     422                        objectSpaceQueue.Top()->GetPriority() / ((float)objectSpaceQueue.Top()->GetPvsEntriesIncr() + Limits::Small); 
    421423 
    422424                cout << "new decicion, vsp: " << vspPriority << ", osp: " << ospPriority << endl; 

  • GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.cpp

    r1658 r1660  
    385385                                delete parser; 
    386386                        } 
    387                         else if (1) 
     387                        else if (0) 
    388388                        { 
    389389                                ExportBinaryObj("../data/test.bin", mSceneGraph->GetRoot()); 

  • GTP/trunk/Lib/Vis/Preprocessing/src/ViewCell.cpp

    r1653 r1660  
    15061506{ 
    15071507         stats << "#Pass\n" << pass << endl 
    1508                    << "#ViewCells\n" << viewCells << endl  
     1508                   << "#Splits\n" << viewCells << endl  
    15091509                   << "#RenderCostDecrease\n" << renderCostDecrease << endl // TODO 
    15101510                   << "#TotalRenderCost\n" << totalRenderCost << endl 

  • GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp

    r1649 r1660  
    3838// HACK 
    3939const static bool SAMPLE_AFTER_SUBDIVISION = true; 
    40 const static bool CLAMP_TO_BOX = false; 
     40const static bool CLAMP_TO_BOX = true; 
    4141 
    4242template <typename T> class myless 
Note: See TracChangeset for help on using the changeset viewer.