Changeset 2105


Ignore:
Timestamp:
02/08/07 15:46:23 (17 years ago)
Author:
bittner
Message:

simple ray separated

Location:
GTP/trunk/Lib/Vis/Preprocessing/src
Files:
1 added
19 edited

Legend:

Unmodified
Added
Removed

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

    r2076 r2105  
    11#include "Halton.h" 
    22#include "PerfTimer.h" 
     3 
     4#define PREGENERATE_HALTON 0 
    35 
    46namespace GtpVisibilityPreprocessor { 
    … …  
    2527  Halton<5> dummmyHalton5(true); 
    2628  Halton<6> dummmyHalton6(true); 
     29 
     30 
     31  int HaltonSequence::sPregeneratedDim = 0; 
     32  int HaltonSequence::sPregeneratedNumber = 0; 
     33  float *HaltonSequence::sPregeneratedValues = NULL; 
    2734   
     35#if PREGENERATE_HALTON 
     36  // pregenerate first 100k numbers for 6 dimensions 
     37  static HaltonSequence staticHalton(6, 200000); 
     38#endif 
     39   
     40  // special construtor for pregenerating static halton sequences 
     41  HaltonSequence::HaltonSequence(const int dim, 
     42                                                                 const int number) { 
     43 
     44        sPregeneratedDim = 0; 
     45        sPregeneratedNumber = 0; 
     46        sPregeneratedValues = new float[number*dim]; 
     47 
     48        float *p = sPregeneratedValues; 
     49        int i; 
     50        for (i=0; i < number; i++, p+=dim) { 
     51          GetNext(dim, p); 
     52        } 
     53         
     54        sPregeneratedDim = dim; 
     55        sPregeneratedNumber = number; 
     56  } 
     57 
    2858void 
    2959HaltonSequence::GetNext(const int dimensions, float *p) 
    3060{ 
    31   haltonTimer.Entry(); 
    32   for (int i=0; i < dimensions; i++) 
    33         p[i] = (float)GetNumber(i+1); 
     61  //  haltonTimer.Entry(); 
     62#if PREGENERATE_HALTON 
     63  if (index <= sPregeneratedNumber && dimensions <= sPregeneratedDim) { 
     64        float *pp = sPregeneratedValues + (sPregeneratedDim*(index-1)); 
     65        for (int i=0; i < dimensions; i++) 
     66          p[i] = pp[i]; 
     67  } else 
     68#endif 
     69        { 
     70          for (int i=0; i < dimensions; i++) 
     71                p[i] = (float)GetNumber(i+1); 
     72        } 
    3473  GenerateNext(); 
    35   haltonTimer.Exit(); 
     74  //  haltonTimer.Exit(); 
    3675} 
    3776 

  • GTP/trunk/Lib/Vis/Preprocessing/src/Halton.h

    r2076 r2105  
    130130public: 
    131131  int index; 
     132 
     133  static int sPregeneratedDim; 
     134  static int sPregeneratedNumber; 
     135  static float *sPregeneratedValues; 
     136   
     137  // special construtor for pregenerating static halton sequences 
     138  HaltonSequence(const int dim, 
     139                                 const int number); 
    132140 
    133141  HaltonSequence():index(1) {} 

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

    r2077 r2105  
    252252 
    253253 
     254 
     255 
     256void 
     257IntelRayCaster::CastSimpleForwardRays( 
     258                                                                          SimpleRayContainer &rays, 
     259                                                                          const AxisAlignedBox3 &sbox 
     260                                                                          ) 
     261{ 
     262  int hit_triangles[16]; 
     263  float dist[16]; 
     264  Vector3 normals[16]; 
     265  Vector3 min = sbox.Min(); 
     266  Vector3 max = sbox.Max(); 
     267   
     268  int packets = rays.size() / 16; 
     269   
     270  int i, j, k = 0; 
     271  Vector3 dir; 
     272   
     273  for (i=0; i < packets; i++) { 
     274        for (j=0; j < 16; j++, k++) 
     275          mlrtaStoreRayAS16(&rays[k].mOrigin.x, 
     276                                                &rays[k].mDirection.x, 
     277                                                j); 
     278         
     279        mlrtaTraverseGroupAS16(&min.x, 
     280                                                   &max.x, 
     281                                                   hit_triangles, 
     282                                                   dist); 
     283 
     284  } 
     285 
     286 
     287  for (; k < rays.size(); k++) { 
     288        double normal[3]; 
     289        hit_triangles[0] = mlrtaIntersectAS( 
     290                                                                                &rays[k].mOrigin.x, 
     291                                                                                &rays[k].mDirection.x, 
     292                                                                                normal, 
     293                                                                                dist[0]); 
     294  } 
     295   
     296} 
     297 
     298 
    254299void 
    255300IntelRayCaster::CastRays( 
    … …  
    263308  int buckets = rays.size()/16; 
    264309  int offset = 0; 
     310 
     311#if 0 
     312  int time = GetTime(); 
     313  CastSimpleForwardRays(rays, sbox); 
     314  cout<<1e-3*2*rays.size()/TimeDiff(time, GetTime())<<" Mrays/sec"<<endl; 
     315#endif 
    265316   
    266317  for (int i=0; i < buckets; i++, offset+=16) { 

  • GTP/trunk/Lib/Vis/Preprocessing/src/IntelRayCaster.h

    r2076 r2105  
    5959                                                        const bool pruneInvalidRays = true); 
    6060 
     61   
     62  void 
     63  CastSimpleForwardRays( 
     64                                                SimpleRayContainer &rays, 
     65                                                const AxisAlignedBox3 &sbox 
     66                                                ); 
     67 
    6168    virtual void CastRays( 
    6269                                                  SimpleRayContainer &rays, 

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

    r2072 r2105  
    119119                                                  hit.mObject, 
    120120                                                  mPreprocessor.mPass, 
    121                                                   simpleRay.mPdf 
     121                                                  1.0f //simpleRay.mPdf 
    122122                                                  ); 
    123123 
    … …  
    139139                                                  hit.mObject, 
    140140                                                  mPreprocessor.mPass, 
    141                                                   simpleRay.mPdf 
     141                                                  1.0f //simpleRay.mPdf 
    142142                                                  ); 
    143143          vssRay->mFlags |= VssRay::Valid; 
    … …  
    162162                                                        hitB.mObject, 
    163163                                                          mPreprocessor.mPass, 
    164                                                           simpleRay.mPdf 
     164                                                          1.0f //simpleRay.mPdf 
    165165                                                          ); 
    166166                  vssRay->mFlags |= VssRay::Valid; 
    … …  
    175175                                                          hitA.mObject, 
    176176                                                          mPreprocessor.mPass, 
    177                                                           simpleRay.mPdf 
     177                                                          1.0f //simpleRay.mPdf 
    178178                                                          ); 
    179179                   

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

    r2077 r2105  
    11############################################################################# 
    22# Makefile for building: preprocessor 
    3 # Generated by qmake (2.00a) (Qt 4.1.2) on: pá 2. II 14:36:11 2007 
     3# Generated by qmake (2.00a) (Qt 4.1.2) on: ?t 8. II 14:44:05 2007 
    44# Project:  preprocessor.pro 
    55# Template: app 

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

    r2076 r2105  
    625625        sray = SimpleRay(mRays[index].mutatedOrigin, 
    626626                                         Normalize(mRays[index].mutatedTermination - mRays[index].mutatedOrigin), 
    627                                          MUTATION_BASED_DISTRIBUTION, 1.0f); 
     627                                         MUTATION_BASED_DISTRIBUTION, 
     628                                         1.0f); 
     629         
     630         
    628631        sray.mGeneratorId = index; 
    629632        mRays[index].ResetReverseMutation(); 
    … …  
    676679  // use probabilitistic approach to decide for the type of mutation 
    677680  float a = RandomValue(0.0f,1.0f); 
    678  
     681  bool bidirectional = true; 
     682   
    679683  if (mUseSilhouetteSamples && a < mSilhouetteProb) { 
     684         
    680685        termination += ComputeSilhouetteTerminationMutation(*ray, 
    681686                                                                                                                origin, 
    … …  
    683688                                                                                                                U, V, 
    684689                                                                                                                2.0f*objectRadius); 
     690        bidirectional = false; 
    685691  } else { 
    686692        mRays[index].mHalton.GetNext(4, rr); 
    … …  
    711717  sray = SimpleRay(origin, direction, MUTATION_BASED_DISTRIBUTION, pdf); 
    712718  sray.mGeneratorId = index; 
    713  
     719  sray.SetBidirectional(bidirectional); 
     720   
    714721  return true; 
    715722} 

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

    r1990 r2105  
    22#include "Matrix4x4.h" 
    33#include "Ray.h" 
     4#include "SimpleRay.h" 
    45 
    56 

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

    r2076 r2105  
    77#include "Mesh.h" 
    88#include "KdTree.h" 
    9  
     9#include "SimpleRay.h" 
    1010 
    1111namespace GtpVisibilityPreprocessor { 

  • GTP/trunk/Lib/Vis/Preprocessing/src/Ray.h

    r1989 r2105  
    4747          Intersectable *mObject; 
    4848 
    49                 /// the face of the intersectable 
     49        /// the face of the intersectable 
    5050          int mFace; 
    5151 
    … …  
    315315}; 
    316316 
    317 struct SimpleRay 
    318 { 
    319   Vector3 mOrigin; 
    320   Vector3 mDirection; 
    321   short mType; 
    322   short mDistribution; 
    323   // generator Id -> relative to the generating distribution! 
    324   int mGeneratorId; 
    325   float mPdf; 
    326    
    327   SimpleRay(): mType(Ray::LOCAL_RAY) { 
    328   } 
    329    
    330   SimpleRay(const Vector3 &o, 
    331                         const Vector3 &d, 
    332                         const short distribution, 
    333                         const float weight 
    334                         ): 
    335         mOrigin(o), 
    336         mDirection(d), 
    337         mType(Ray::LOCAL_RAY), 
    338         mDistribution(distribution), 
    339         mPdf(weight) 
    340   {      
    341         //      mId = sSimpleRayId++; 
    342   } 
    343  
    344   float GetParam(const int axis) const { 
    345         if (axis < 3) 
    346           return mOrigin[axis]; 
    347         else 
    348           return mDirection[axis-3]; 
    349   } 
    350    
    351   Vector3 Extrap(const float t) const { 
    352           return mOrigin + mDirection * t; 
    353   } 
    354  
    355   friend ostream &operator<<(ostream &s, const SimpleRay &r) 
    356   { 
    357           return s << "origin=" << r.mOrigin << " dir=" << r.mDirection; 
    358   }; 
    359 }; 
    360  
    361 class SimpleRayContainer : public vector<SimpleRay> 
    362 { 
    363 public: 
    364      
    365   SimpleRayContainer():vector<SimpleRay>() {} 
    366    
    367   void NormalizePdf(float scale = 1.0f) { 
    368         iterator it = begin(); 
    369         float sumPdf = 0.0f; 
    370         for (; it != end(); it++) 
    371           sumPdf += (*it).mPdf; 
    372  
    373         float c = scale/sumPdf; 
    374          
    375         for (it = begin(); it != end(); it++) { 
    376           (*it).mPdf*=c; 
    377         } 
    378   } 
    379    
    380   void AddRay(const SimpleRay &ray) { 
    381         push_back(ray); 
    382   } 
    383 }; 
    384317 
    385318} 

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

    r2076 r2105  
    123123  AxisAlignedBox3 box = 
    124124        mPreprocessor.mViewCellsManager->GetViewSpaceBox(); 
    125          
     125   
    126126  float b[12]={ 
    127127        box.Min().x, 
    … …  
    139139  }; 
    140140 
     141#if 0 
     142  static vector<SimpleRay *> pointerArray; 
     143 
     144  if (pointerArray.size()!=rays.size()) { 
     145        // realloc the pointerarray 
     146        pointerArray.resize(rays.size()); 
     147  } 
     148 
     149  // init pointer array 
     150  SimpleRay *p = &pointerArray[0]; 
     151  for (i=0; i < rays.size(); i++, p++) 
     152        pointerArray[i] = p; 
     153#endif 
     154   
    141155  _SortRays(rays, 
    142156                        0, 
    … …  
    162176  int i; 
    163177 
     178  //const int batchsize = 16384; 
    164179  const int batchsize = 8192; 
    165  
    166   //  if (r - l < 32*batchsize) 
    167   //    offset = 3; 
    168          
    169   //  if (depth%5==0) 
     180  //const int batchsize = 128; 
     181 
     182  //if (r - l < 16*batchsize) 
     183  //    offset = 3; 
     184         
     185  //  if (depth%2==0) 
    170186  //    offset = 3; 
    171187   
    … …  
    305321                                                 hitA.mObject, 
    306322                                                 mPreprocessor.mPass, 
    307                                                  simpleRay.mPdf 
     323                                                 1.0f //simpleRay.mPdf 
    308324                                                 ); 
    309325#if DEBUG_RAYCAST 
    … …  
    336352                        hitB.mObject, 
    337353                        mPreprocessor.mPass, 
    338                         simpleRay.mPdf 
     354                        1.0f //simpleRay.mPdf 
    339355                        ); 
    340356 

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

    r2002 r2105  
    647647                                         rays); 
    648648                 
     649#if 0 
    649650                rays.NormalizePdf((float)rays.size()); 
    650                  
     651#endif 
    651652                CastRays(rays, tmpVssRays, true, pruneInvalidRays); 
    652653                castRays += (int)rays.size(); 

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

    r2053 r2105  
    22942294  //  Debug<<"D"<<flush; 
    22952295   
     2296#if 0 
    22962297  float density = 1.0f; 
    22972298  float p = 1.0f/density; //(box.GetVolume()*dirBox.GetVolume())/i; 
    … …  
    22992300        rays[i].mPdf = p; 
    23002301  } 
     2302#endif 
    23012303} 
    23022304 
    … …  
    25102512  // assign pdfs to the generated rays 
    25112513  // float density = generated/(box.SurfaceArea()*dirBox.GetVolume()); 
     2514#if 0 
    25122515  float density = 1.0f; 
    2513  
     2516   
    25142517  float p = 1.0f/density; //(box.GetVolume()*dirBox.GetVolume())/i; 
    25152518  for (int i=startIndex; i < rays.size(); i++) { 
    25162519        rays[i].mPdf = p; 
    25172520  } 
    2518    
     2521#endif 
    25192522   
    25202523  if (exporter) { 

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

    r2100 r2105  
    2727#include "PerfTimer.h" 
    2828 
    29 #include "HashPvs.h" 
     29//#include "HashPvs.h" 
    3030 
    3131 
    … …  
    15451545                 
    15461546                castSamples += samplesPerPass; 
    1547 HashPvs<int> dummy; 
     1547                //HashPvs<int> dummy; 
    15481548 
    15491549                Real timeDiff = TimeDiff(startTime, GetTime()); 

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

    r2048 r2105  
    33 
    44#include "Ray.h" 
     5#include "SimpleRay.h" 
    56#include "VssRay.h" 
    67#include "Containers.h" 

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

    r1883 r2105  
    2424#include "Intersectable.h" 
    2525#include "Ray.h" 
     26#include "SimpleRay.h" 
    2627#include "SamplingStrategy.h" 
    2728 

  • GTP/trunk/Lib/Vis/Preprocessing/src/VssTree.h

    r1259 r2105  
    3030#define _RSS_TRAVERSAL_STATISTICS 
    3131 
     32class SimpleRayContainer; 
    3233 
    3334 

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

    r2076 r2105  
    116116RenderTexture.cpp Mutation.cpp Timer/RDTSCTimer.cpp \ 
    117117Timer/BenchTimer.cpp Timer/merror.cpp \ 
    118 Intersectable.cpp 
     118Intersectable.cpp TraversalTree.cpp 
    119119 
    120120SOURCES += BoostPreprocessorThread.cpp  

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

    r2051 r2105  
    22 
    33#COMMAND="./release/preprocessor.exe -preprocessor_quit_on_finish+" 
    4 COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -preprocessor_detect_empty_viewspace- -total_samples=500000000" 
     4#COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -preprocessor_detect_empty_viewspace- -total_samples=500000000" 
     5 
     6COMMAND="../scripts/preprocessor.sh -preprocessor_quit_on_finish+ -preprocessor_use_gl_renderer- -preprocessor_evaluate_filter- -preprocessor_detect_empty_viewspace+ -samples_per_evaluation=5000000 -samples_per_pass=1000000 -total_samples=250000000 -view_cells_use_kd_pvs+" 
    57 
    68 
    … …  
    810VIEWCELLS=../data/Pompeii/pompeii_big-seq-viewcells.xml.gz 
    911 
    10 PREFIX=../work/plots/osp-pompeiiTEST-1e5 
    11  
    12  
    13 # $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    14 #  -rss_distributions=mutation+object_direction+spatial -view_cells_filter_max_size=1 \ 
    15 #  -preprocessor_visibility_file=$PREFIX-i-mixed-b1-n4n.xml \ 
    16 #  -preprocessor_stats=$PREFIX-i-mixed-b1-n4n.log \ 
    17 #  -preprocessor_histogram_file=$PREFIX-i-mixed-b1-n4n.hlog 
    18  
    19 # # n - no origin mutation, q=2, reverse samples 
    20  
    21 # $COMMAND -preprocessor=sampling -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    22 # -preprocessor_visibility_file=$PREFIX-r-reference.xml \ 
    23 # -view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-reference.log \ 
    24 # -preprocessor_histogram_file=$PREFIX-r-reference.hlog 
    25  
    26 # $COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    27 #  -rss_distributions=direction -view_cells_filter_max_size=1 \ 
    28 #  -preprocessor_visibility_file=$PREFIX-r-reference-global.xml \ 
    29 #  -preprocessor_stats=$PREFIX-r-reference-global.log \ 
    30 #  -preprocessor_histogram_file=$PREFIX-r-reference-global.hlog 
    31  
    32  
    33 ##### BVH measurements 
    34  
    35 # $COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    36 #  -rss_distributions=mutation+object_direction+spatial \ 
    37 #  -view_cells_use_kd_pvs- -af_use_kd_pvs- \ 
    38 #  -preprocessor_visibility_file=$PREFIX-i-mixed-bvh-n4n.xml \ 
    39 #  -preprocessor_stats=$PREFIX-i-mixed-bvh-n4n.log \ 
    40 #  -preprocessor_histogram_file=$PREFIX-i-mixed-bvh-n4n.hlog 
    41  
     12PREFIX=../work/plots/osp-pompeii3 
     13 
     14 
     15###################### 
     16###################### 
    4217 
    4318$COMMAND -preprocessor=sampling -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    44 -view_cells_use_kd_pvs- -af_use_kd_pvs- \ 
    45 -preprocessor_visibility_file=$PREFIX-r-bvh-reference.xml \ 
    46 -view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-bvh-reference.log \ 
    47 -preprocessor_histogram_file=$PREFIX-r-bvh-reference.hlog 
     19-preprocessor_visibility_file=$PREFIX-reference.xml \ 
     20-view_cells_filter_max_size=1 -preprocessor_stats=$PREFIX-r-reference.log \ 
     21-preprocessor_histogram_file=$PREFIX-r-reference.hlog 
    4822 
    4923$COMMAND -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
    50  -view_cells_use_kd_pvs- -af_use_kd_pvs- \ 
    5124 -rss_distributions=direction -view_cells_filter_max_size=1 \ 
    52  -preprocessor_visibility_file=$PREFIX-r-bvh-reference-global.xml \ 
    53  -preprocessor_stats=$PREFIX-r-bvh-reference-global.log \ 
    54  -preprocessor_histogram_file=$PREFIX-r-bvh-reference-global.hlog 
    55  
    56  
    57 #mutation+object_direction+ 
     25 -preprocessor_visibility_file=$PREFIX-r-reference-global.xml \ 
     26 -preprocessor_stats=$PREFIX-reference-global.log \ 
     27 -preprocessor_histogram_file=$PREFIX-r-reference-global.hlog 
     28 
     29$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     30-mutation_buffer_size=100000 \ 
     31-rss_distributions=mutation+object_direction+spatial \ 
     32-preprocessor_stats=$PREFIX-combined-m1-1.log  
     33 
     34$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     35-mutation_buffer_size=200000 \ 
     36-rss_distributions=mutation+object_direction+spatial \ 
     37-preprocessor_stats=$PREFIX-combined-m1-2.log  
     38 
     39$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     40-mutation_buffer_size=500000 \ 
     41-rss_distributions=mutation+object_direction+spatial \ 
     42-preprocessor_stats=$PREFIX-combined-m1-3.log  
     43 
     44$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     45-mutation_buffer_size=1000000 \ 
     46-rss_distributions=mutation+object_direction+spatial \ 
     47-preprocessor_stats=$PREFIX-combined-m1-4.log  
     48 
     49$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     50-mutation_buffer_size=2000000 \ 
     51-rss_distributions=mutation+object_direction+spatial \ 
     52-preprocessor_stats=$PREFIX-combined-m1-5.log  
     53 
     54$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     55-mutation_buffer_size=4000000 \ 
     56-rss_distributions=mutation+object_direction+spatial \ 
     57-preprocessor_stats=$PREFIX-combined-m1-6.log  
     58 
     59 
     60# ############################ 
     61# #### AND now the same with pass importance off 
     62 
     63$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     64-mutation_use_pass_importance- \ 
     65-mutation_buffer_size=100000 \ 
     66-rss_distributions=mutation+object_direction+spatial \ 
     67-preprocessor_stats=$PREFIX-combined-m2-1.log  
     68 
     69$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     70-mutation_use_pass_importance- \ 
     71-mutation_buffer_size=200000 \ 
     72-rss_distributions=mutation+object_direction+spatial \ 
     73-preprocessor_stats=$PREFIX-combined-m2-2.log  
     74 
     75$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     76-mutation_use_pass_importance- \ 
     77-mutation_buffer_size=500000 \ 
     78-rss_distributions=mutation+object_direction+spatial \ 
     79-preprocessor_stats=$PREFIX-combined-m2-3.log  
     80 
     81$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     82-mutation_use_pass_importance- \ 
     83-mutation_buffer_size=1000000 \ 
     84-rss_distributions=mutation+object_direction+spatial \ 
     85-preprocessor_stats=$PREFIX-combined-m2-4.log  
     86 
     87$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     88-mutation_use_pass_importance- \ 
     89-mutation_buffer_size=2000000 \ 
     90-rss_distributions=mutation+object_direction+spatial \ 
     91-preprocessor_stats=$PREFIX-combined-m2-5.log  
     92 
     93$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     94-mutation_use_pass_importance- \ 
     95-mutation_buffer_size=4000000 \ 
     96-rss_distributions=mutation+object_direction+spatial \ 
     97-preprocessor_stats=$PREFIX-combined-m2-6.log  
     98 
     99# ################################################ 
     100# # silhouetee probability test 
     101# ################################################ 
     102 
     103$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     104-mutation_silhouette_prob=0.0 \ 
     105-mutation_use_pass_importance- \ 
     106-mutation_buffer_size=500000 \ 
     107-rss_distributions=mutation+object_direction+spatial \ 
     108-preprocessor_stats=$PREFIX-combined-m3-1.log  
     109 
     110$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     111-mutation_silhouette_prob=0.2 \ 
     112-mutation_use_pass_importance- \ 
     113-mutation_buffer_size=500000 \ 
     114-rss_distributions=mutation+object_direction+spatial \ 
     115-preprocessor_stats=$PREFIX-combined-m3-2.log  
     116 
     117$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     118-mutation_silhouette_prob=0.5 \ 
     119-mutation_use_pass_importance- \ 
     120-mutation_buffer_size=500000 \ 
     121-rss_distributions=mutation+object_direction+spatial \ 
     122-preprocessor_stats=$PREFIX-combined-m3-3.log  
     123 
     124$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     125-mutation_silhouette_prob=0.8 \ 
     126-mutation_use_pass_importance- \ 
     127-mutation_buffer_size=500000 \ 
     128-rss_distributions=mutation+object_direction+spatial \ 
     129-preprocessor_stats=$PREFIX-combined-m3-4.log  
     130 
     131$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     132-mutation_silhouette_prob=1.0 \ 
     133-mutation_use_pass_importance- \ 
     134-mutation_buffer_size=500000 \ 
     135-rss_distributions=mutation+object_direction+spatial \ 
     136-preprocessor_stats=$PREFIX-combined-m3-5.log  
     137 
     138 
     139################################################ 
     140# reverse test 
     141################################################ 
     142 
     143$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     144-mutation_reverse_samples_distance=1.0 \ 
     145-mutation_use_pass_importance- \ 
     146-mutation_buffer_size=500000 \ 
     147-rss_distributions=mutation+object_direction+spatial \ 
     148-preprocessor_stats=$PREFIX-combined-m4-1.log  
     149 
     150 
     151$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     152-mutation_reverse_samples_distance=100000.0 \ 
     153-mutation_use_pass_importance- \ 
     154-mutation_buffer_size=500000 \ 
     155-rss_distributions=mutation+object_direction+spatial \ 
     156-preprocessor_stats=$PREFIX-combined-m4-2.log  
     157 
     158 
     159### unsucc count test 
     160 
     161 
     162 
     163$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     164-mutation_use_unsucc_count_importance+ \ 
     165-mutation_use_pass_importance- \ 
     166-mutation_buffer_size=2000000 \ 
     167-rss_distributions=mutation+object_direction+spatial \ 
     168-preprocessor_stats=$PREFIX-combined-m5-1.log  
     169 
     170 
     171$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     172-mutation_use_unsucc_count_importance+ \ 
     173-mutation_use_pass_importance- \ 
     174-mutation_buffer_size=500000 \ 
     175-rss_distributions=mutation+object_direction+spatial \ 
     176-preprocessor_stats=$PREFIX-combined-m5-2.log  
     177 
     178 
     179########################################### 
     180# search steps test 
     181########################################### 
     182 
     183$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     184-mutation_silhouette_search_steps=1 \ 
     185-mutation_buffer_size=500000 \ 
     186-rss_distributions=mutation+object_direction+spatial \ 
     187-preprocessor_stats=$PREFIX-combined-m6-1.log  
     188 
     189$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     190-mutation_silhouette_search_steps=2 \ 
     191-mutation_buffer_size=500000 \ 
     192-rss_distributions=mutation+object_direction+spatial \ 
     193-preprocessor_stats=$PREFIX-combined-m6-2.log  
     194 
     195$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     196-mutation_silhouette_search_steps=4 \ 
     197-mutation_buffer_size=500000 \ 
     198-rss_distributions=mutation+object_direction+spatial \ 
     199-preprocessor_stats=$PREFIX-combined-m6-3.log  
     200 
     201 
     202########################################### 
     203# radius test 
     204########################################### 
     205 
     206$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     207-mutation_radius_origin=0.2 \ 
     208-mutation_radius_termination=0.2 \ 
     209-mutation_silhouette_prob=0.5 \ 
     210-mutation_use_pass_importance- \ 
     211-mutation_buffer_size=500000 \ 
     212-rss_distributions=mutation+object_direction+spatial \ 
     213-preprocessor_stats=$PREFIX-combined-m7-1.log  
     214 
     215$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     216-mutation_radius_origin=1.0 \ 
     217-mutation_radius_termination=1.0 \ 
     218-mutation_silhouette_prob=0.5 \ 
     219-mutation_use_pass_importance- \ 
     220-mutation_buffer_size=500000 \ 
     221-rss_distributions=mutation+object_direction+spatial \ 
     222-preprocessor_stats=$PREFIX-combined-m7-2.log  
     223 
     224$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     225-mutation_radius_origin=0.5 \ 
     226-mutation_radius_termination=0.2 \ 
     227-mutation_silhouette_prob=0.5 \ 
     228-mutation_use_pass_importance- \ 
     229-mutation_buffer_size=500000 \ 
     230-rss_distributions=mutation+object_direction+spatial \ 
     231-preprocessor_stats=$PREFIX-combined-m7-3.log  
     232 
     233$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     234-mutation_radius_origin=0.5 \ 
     235-mutation_radius_termination=1.0 \ 
     236-mutation_silhouette_prob=0.5 \ 
     237-mutation_use_pass_importance- \ 
     238-mutation_buffer_size=500000 \ 
     239-rss_distributions=mutation+object_direction+spatial \ 
     240-preprocessor_stats=$PREFIX-combined-m7-4.log  
     241 
     242$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     243-mutation_radius_origin=0.2 \ 
     244-mutation_radius_termination=0.5 \ 
     245-mutation_silhouette_prob=0.5 \ 
     246-mutation_use_pass_importance- \ 
     247-mutation_buffer_size=500000 \ 
     248-rss_distributions=mutation+object_direction+spatial \ 
     249-preprocessor_stats=$PREFIX-combined-m7-5.log  
     250 
     251 
     252$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     253-mutation_radius_origin=1.0 \ 
     254-mutation_radius_termination=0.5 \ 
     255-mutation_silhouette_prob=0.5 \ 
     256-mutation_use_pass_importance- \ 
     257-mutation_buffer_size=500000 \ 
     258-rss_distributions=mutation+object_direction+spatial \ 
     259-preprocessor_stats=$PREFIX-combined-m7-6.log  
     260 
     261$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     262-mutation_radius_origin=2.0 \ 
     263-mutation_radius_termination=0.5 \ 
     264-mutation_silhouette_prob=0.5 \ 
     265-mutation_use_pass_importance- \ 
     266-mutation_buffer_size=500000 \ 
     267-rss_distributions=mutation+object_direction+spatial \ 
     268-preprocessor_stats=$PREFIX-combined-m7-7.log  
     269 
     270 
     271### selected tests 
     272 
     273 
     274$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     275-mutation_silhouette_prob=0.5 \ 
     276-mutation_reverse_samples_distance=1.0 \ 
     277-mutation_radius_origin=0.5 \ 
     278-mutation_radius_termination=0.2 \ 
     279-mutation_use_unsucc_count_importance+ \ 
     280-mutation_use_pass_importance- \ 
     281-mutation_buffer_size=2000000 \ 
     282-rss_distributions=mutation+object_direction+spatial \ 
     283-preprocessor_stats=$PREFIX-combined-m8-1.log  
     284 
     285$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     286-mutation_silhouette_prob=0.5 \ 
     287-mutation_reverse_samples_distance=1.0 \ 
     288-mutation_radius_origin=1.0 \ 
     289-mutation_radius_termination=0.2 \ 
     290-mutation_use_unsucc_count_importance+ \ 
     291-mutation_use_pass_importance- \ 
     292-mutation_buffer_size=2000000 \ 
     293-rss_distributions=mutation+object_direction+spatial \ 
     294-preprocessor_stats=$PREFIX-combined-m8-2.log  
     295 
     296$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     297-mutation_silhouette_prob=0.5 \ 
     298-mutation_reverse_samples_distance=1.0 \ 
     299-mutation_radius_origin=2.0 \ 
     300-mutation_radius_termination=0.2 \ 
     301-mutation_use_unsucc_count_importance+ \ 
     302-mutation_use_pass_importance- \ 
     303-mutation_buffer_size=2000000 \ 
     304-rss_distributions=mutation+object_direction+spatial \ 
     305-preprocessor_stats=$PREFIX-combined-m8-3.log  
     306 
     307$COMMAND -preprocessor=combined -scene_filename=$SCENE -view_cells_filename=$VIEWCELLS \ 
     308-mutation_silhouette_prob=0.5 \ 
     309-mutation_reverse_samples_distance=1.0 \ 
     310-mutation_radius_origin=0.5 \ 
     311-mutation_radius_termination=0.2 \ 
     312-mutation_use_unsucc_count_importance- \ 
     313-mutation_use_pass_importance+ \ 
     314-mutation_buffer_size=2000000 \ 
     315-rss_distributions=mutation+object_direction+spatial \ 
     316-preprocessor_stats=$PREFIX-combined-m8-4.log  
Note: See TracChangeset for help on using the changeset viewer.