Changeset 2043


Ignore:
Timestamp:
01/23/07 16:29:58 (17 years ago)
Author:
bittner
Message:

timing restored

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

Legend:

Unmodified
Added
Removed

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

    r2036 r2043  
    1414#include "RayCaster.h" 
    1515 
    16 //#include "PerfTimer.h" 
    1716 
    1817 
    1918namespace GtpVisibilityPreprocessor { 
    2019 
    21   //extern PerfTimer viewCellCastTimer; 
    22   //extern PerfTimer pvsTimer; 
    23   //extern PerfTimer objTimer; 
    2420 
    2521const bool pruneInvalidRays = true; 
    … …  
    8177        mRayCaster->InitPass(); 
    8278         
    83         cout<<"Progress :"<<mTotalSamples/1e6f<<"M rays, "<<(100.0f*i)/mTotalSamples<<"%"<<endl; 
     79        cout<<"Progress :"<<i/1e6f<<"M rays, "<<(100.0f*i)/mTotalSamples<<"%"<<endl; 
    8480         
    8581        rays.clear(); 
    … …  
    9591        mMixtureDistribution->ComputeContributions(vssRays); 
    9692 
    97         //cout<<"view cell cast time:"<<viewCellCastTimer.TotalTime()<<" s"<<endl; 
    98         //cout<<"pvs time:"<<pvsTimer.TotalTime()<<" s"<<endl; 
    99         //cout<<"obj time:"<<objTimer.TotalTime()<<" s"<<endl; 
    10093 
    10194        if (mExportRays) { 

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

    r2035 r2043  
    114114          for (; rays.size() < 16; ) { 
    115115                if (i%100000 == 0) { 
    116                   cout<<samples/1e6f<<"M rays, progress: "<<samples*100/mTotalSamples<<" %   \r"; 
     116                  cout<<samples/1e6f<<"M rays, progress: "<<(samples*100.0f)/mTotalSamples<<" %   \r"; 
    117117                } 
    118118                 

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

    r2042 r2043  
    77#include "RssTree.h" 
    88#include "Mutation.h" 
    9 //#include "PerfTimer.h" 
     9#include "PerfTimer.h" 
    1010 
    1111namespace GtpVisibilityPreprocessor { 
    1212 
    13 //extern PerfTimer pvsTimer; 
     13   
     14  extern PerfTimer pvsTimer; 
     15  extern PerfTimer viewCellCastTimer; 
    1416 
    1517//HaltonSequence SamplingStrategy::sHalton; 
    … …  
    556558   
    557559  UpdateRatios(); 
     560 
     561  cout<<"view cell cast time:"<<viewCellCastTimer.TotalTime()<<" s"<<endl; 
     562  cout<<"pvs time:"<<pvsTimer.TotalTime()<<" s"<<endl; 
     563        //cout<<"obj time:"<<objTimer.TotalTime()<<" s"<<endl; 
    558564 
    559565} 

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

    r2023 r2043  
    2525#include "SceneGraph.h" 
    2626 
    27 //#include "PerfTimer.h" 
     27#include "PerfTimer.h" 
    2828 
    2929 
    … …  
    3939 
    4040 
    41 //PerfTimer viewCellCastTimer; 
    42 //PerfTimer pvsTimer; 
    43 //PerfTimer objTimer; 
     41PerfTimer viewCellCastTimer; 
     42PerfTimer pvsTimer; 
     43PerfTimer objTimer; 
    4444 
    4545// HACK 
    … …  
    27002700        ViewCell::NewMail(); 
    27012701         
    2702         //viewCellCastTimer.Entry(); 
     2702        viewCellCastTimer.Entry(); 
    27032703 
    27042704        static ViewCellContainer viewCells; 
    … …  
    27142714        } 
    27152715         
    2716         //viewCellCastTimer.Exit(); 
     2716        viewCellCastTimer.Exit(); 
    27172717 
    27182718        mSamplesStat.mViewCells += (int)viewCells.size(); 
    … …  
    27332733        Intersectable *terminationObj; 
    27342734         
    2735         //      objTimer.Entry(); 
     2735        objTimer.Entry(); 
    27362736 
    27372737        // obtain pvs entry (can be different from hit object) 
    27382738        terminationObj = ray.mTerminationObject; 
    27392739         
    2740         //      objTimer.Exit(); 
    2741          
    2742         //pvsTimer.Entry(); 
     2740        objTimer.Exit(); 
     2741         
     2742        pvsTimer.Entry(); 
    27432743 
    27442744        ViewCellContainer::const_iterator it = viewCells.begin(); 
    … …  
    27532753        } 
    27542754 
    2755         //pvsTimer.Exit(); 
     2755        pvsTimer.Exit(); 
    27562756 
    27572757        mSamplesStat.mPvsContributions += ray.mPvsContribution; 

  • GTP/trunk/Lib/Vis/Preprocessing/src/run_test_pompeii

    r2035 r2043  
    1010PREFIX=../work/plots/osp-pompeii4-1e5 
    1111 
    12 # $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    13 # -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \ 
    14 # -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4n.xml \ 
    15 # -preprocessor_stats=$PREFIX-i-mixed-b1-n4n.log \ 
    16 # -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4n.hlog 
     12$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     13 -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \ 
     14 -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4n.xml \ 
     15 -preprocessor_stats=$PREFIX-i-mixed-b1-n4n.log \ 
     16 -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4n.hlog 
    1717 
    1818# # n - no origin mutation, q=2, reverse samples 
     19 
     20# $COMMAND -preprocessor=sampling -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     21# -preprocessor_visibility_file=$PREFIX-r-reference.xml \ 
     22# -view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-reference.log \ 
     23# -preprocessor_histogram_file=$PREFIX-r-reference.hlog 
     24 
     25# $COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     26#  -rss_distributions=direction -view_cells_filter_max_size=1 \ 
     27#  -preprocessor_visibility_file=$PREFIX-r-reference-global.xml \ 
     28#  -preprocessor_stats=$PREFIX-r-reference-global.log \ 
     29#  -preprocessor_histogram_file=$PREFIX-r-reference-global.hlog 
     30 
     31 
     32##### BVH measurements 
    1933 
    2034# $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    … …  
    2539#  -preprocessor_histogram_file=$PREFIX-i-mixed-bvh-n4n.hlog 
    2640 
     41 
    2742$COMMAND -preprocessor=sampling -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    28 -preprocessor_visibility_file=$PREFIX-r-reference.xml \ 
    29 -view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-reference.log \ 
    30 -preprocessor_histogram_file=$PREFIX-r-reference.hlog 
     43-view_cells_use_kd_pvs- -af_use_kd_pvs- \ 
     44-preprocessor_visibility_file=$PREFIX-r-bvh-reference.xml \ 
     45-view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-bvh-reference.log \ 
     46-preprocessor_histogram_file=$PREFIX-r-bvh-reference.hlog 
    3147 
    3248$COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     49 -view_cells_use_kd_pvs- -af_use_kd_pvs- \ 
    3350 -rss_distributions=direction -view_cells_filter_max_size=1 \ 
    34  -preprocessor_visibility_file=$PREFIX-r-reference-global.xml \ 
    35  -preprocessor_stats=$PREFIX-r-reference-global.log \ 
    36  -preprocessor_histogram_file=$PREFIX-r-reference-global.hlog 
     51 -preprocessor_visibility_file=$PREFIX-r-bvh-reference-global.xml \ 
     52 -preprocessor_stats=$PREFIX-r-bvh-reference-global.log \ 
     53 -preprocessor_histogram_file=$PREFIX-r-bvh-reference-global.hlog 
     54 
    3755 
    3856#mutation+object_direction+ 
Note: See TracChangeset for help on using the changeset viewer.