Changeset 2051


Ignore:
Timestamp:
01/24/07 15:59:29 (17 years ago)
Author:
bittner
Message:
 
Location:
GTP/trunk/Lib/Vis/Preprocessing/src
Files:
7 edited

Legend:

Unmodified
Added
Removed

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

    r2049 r2051  
    115115        } 
    116116 
     117 
    117118        mMixtureDistribution->UpdateDistributions(vssRays); 
    118119         
    … …  
    125126                "#TotalSamples\n" <<i<<endl<< 
    126127                "#RssSamples\n" <<totalVssRays<<endl; 
     128 
     129          float last = 0.0f; 
     130          for (int k=0; k < 6; k++) { 
     131                float ratio = 0.0f; 
     132                if (k < mMixtureDistribution->mDistributions.size()) { 
     133                  ratio = mMixtureDistribution->mDistributions[k]->mRatio-last; 
     134                  last = mMixtureDistribution->mDistributions[k]->mRatio;; 
     135                } 
     136                mStats << 
     137                  "#Distribution"<<k<<endl<< 
     138                  ratio<<endl; 
     139          } 
     140           
    127141          lastEvaluation = i; 
    128  
     142           
    129143          if (renderer) { 
    130144                ComputeRenderError(); 
    131145          } 
    132146        } 
    133  
     147         
     148         
    134149        long time = TimeDiff(startTime, GetTime()); 
    135150        if (mTotalTime!= -1 && time/1000 > mTotalTime) 

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

    r2048 r2051  
    14201420                                        optFloat, 
    14211421                                        "view_cells_filter_width=", 
    1422                                         "200.0"); 
     1422                                        "1.0"); 
    14231423 
    14241424        RegisterOption("ViewCells.loadFromFile", 

  • GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.cpp

    r2050 r2051  
    116116                                                                        pvs); 
    117117  } 
    118  
     118   
    119119  //  cout<<"pvs size"<<pvs.GetSize()<<endl<<flush; 
    120120 

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

    r2048 r2051  
    24562456                  PvsFilterStatistics fstat = ApplyFilter2(viewcell, 
    24572457                                                                                                   false, 
    2458                                                                                                    1.0f, 
     2458                                                                                                   mFilterWidth, 
    24592459                                                                                                   filteredPvs); 
    24602460                   
    … …  
    35053505          } 
    35063506#else 
    3507           radius = 0.5f*globalRadius + 0.5f*localRadius; 
    3508  
     3507 
     3508          //      radius = 0.5f*globalRadius + 0.5f*localRadius; 
     3509          radius = Min(globalRadius, localRadius); 
     3510           
    35093511          if (localRadius > globalRadius)  
    35103512                stats.mLocalFilterCount++; 

  • GTP/trunk/Lib/Vis/Preprocessing/src/default.env

    r2050 r2051  
    6161#       type render 
    6262        detectEmptyViewSpace true 
    63         pvsRenderErrorSamples 20 
     63        pvsRenderErrorSamples 0 
    6464#       pvsRenderErrorSamples 10000 
    6565        quitOnFinish false 

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

    r2049 r2051  
    33 
    44#COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+" 
    5 COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -samples_per_pass=1000000 -total_samples=1000000000" 
     5COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter+ -samples_per_evaluation=5000000 -samples_per_pass=1000000 -total_samples=100000000" 
     6 
    67 
    78#SCENE="../data/vienna/vienna-buildings.x3d;../data/vienna/vienna-roofs.x3d;../data/vienna/vienna-roads.x3d" 
    … …  
    3132VIEWCELLS=../data/vienna/vienna_cropped-gradient-viewcells.xml.gz 
    3233 
    33 PREFIX=../work/plots/osp-TEST-1e5 
     34# SCENE=../data/Pompeii/PompeiiTen.obj 
     35# VIEWCELLS=../data/Pompeii/pompeii_big-seq-viewcells.xml.gz 
     36 
     37PREFIX=../work/plots/osp-FILTER-1e5 
    3438 
    3539#SCENE=../data/atlanta/atlanta2.x3d 
    … …  
    3741 
    3842 
    39 # $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    40 # -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \ 
    41 # -view_cells_use_kd_pvs+ -af_use_kd_pvs+ \ 
    42 # -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4l.xml \ 
    43 # -preprocessor_stats=$PREFIX-i-mixed-b1-n4l.log \ 
    44 # -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4l.hlog 
     43$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     44-rss_distributions=mutation+object_direction+spatial \ 
     45-view_cells_filter_width=1.0 \ 
     46-view_cells_use_kd_pvs+ -af_use_kd_pvs- \ 
     47-preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4a.xml \ 
     48-preprocessor_stats=$PREFIX-i-mixed-b1-n4a.log \ 
     49-preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4a.hlog 
    4550 
    46 $COMMAND -preprocessor=sampling -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    47 -preprocessor_visibility_file=$PREFIX-r-reference.xml \ 
    48 -view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-reference.log \ 
    49 -preprocessor_histogram_file=$PREFIX-r-reference.hlog 
     51$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     52-rss_distributions=mutation+object_direction+spatial \ 
     53-view_cells_filter_width=0.0 \ 
     54-view_cells_use_kd_pvs+ -af_use_kd_pvs- \ 
     55-preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4b.xml \ 
     56-preprocessor_stats=$PREFIX-i-mixed-b1-n4b.log \ 
     57-preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4b.hlog 
     58 
     59$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     60-rss_distributions=mutation+object_direction+spatial \ 
     61-view_cells_filter_width=1.0 \ 
     62-view_cells_use_kd_pvs+ -af_use_kd_pvs+ \ 
     63-preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4c.xml \ 
     64-preprocessor_stats=$PREFIX-i-mixed-b1-n4c.log \ 
     65-preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4c.hlog 
     66 
     67# $COMMAND -preprocessor=sampling -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     68# -preprocessor_visibility_file=$PREFIX-r-reference.xml \ 
     69# -view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-reference.log \ 
     70# -preprocessor_histogram_file=$PREFIX-r-reference.hlog 
    5071 
    5172# $COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 

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

    r2049 r2051  
    88VIEWCELLS=../data/Pompeii/pompeii_big-seq-viewcells.xml.gz 
    99 
    10 PREFIX=../work/plots/osp-pompeii4-1e5 
     10PREFIX=../work/plots/osp-pompeiiTEST-1e5 
    1111 
    1212 
Note: See TracChangeset for help on using the changeset viewer.