Changeset 2232 for GTP/trunk/Lib/Vis
- Timestamp:
- 03/12/07 00:18:23 (18 years ago)
- Location:
- GTP/trunk/Lib/Vis/Preprocessing
- Files:
-
- 9 edited
Legend:
- Unmodified
- Added
- Removed
-
GTP/trunk/Lib/Vis/Preprocessing/scripts/gi_final.env
r2228 r2232 183 183 samplesForStats 30000000 184 184 185 samplesPerPass 1000000186 187 ##stepSize 500185 samplesPerPass 250000 186 187 #stepSize 500 188 188 stepSize 100 189 189 -
GTP/trunk/Lib/Vis/Preprocessing/scripts/gi_final.sh
r2228 r2232 9 9 PROGRAM=../bin/$TARGET/Preprocessor.exe 10 10 11 SCENE=vienna_cropped.obj 11 EXT=obj 12 SCENE=vienna_cropped 12 13 SCENE_PATH=../data/vienna 13 14 … … 22 23 echo "starting $TARGET mode for $SCENE scene ($PROGRAM)" 23 24 24 25 ################################################################################## 26 27 USE_HEUR=true 28 METHOD=int-$USE_HEUR 29 echo "$SCENE $METHOD" 30 31 32 #$PROGRAM $ENVIRONMENT \ 33 #-scene_filename=$SCENE_PATH/$SCENE \ 34 # -view_cells_sampling_type=box \ 35 # -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 36 # -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ 37 # -view_cells_filename=$LOG_PREFIX-$METHOD-viewcells.xml.gz \ 38 # -vsp_subdivision_stats=$LOG_PREFIX-$METHOD-vsp-subdivisionStats.log \ 39 # -bvh_subdivision_stats=$LOG_PREFIX-$METHOD-bvh-subdivisionStats.log \ 40 # -hierarchy_subdivision_stats=$LOG_PREFIX-$METHOD-hierarchy-subdivisionStats.log \ 41 # -hierarchy_construction_type=2 \ 42 # -hierarchy_construction_consider_memory=true \ 43 # -bvh_use_sah=false \ 44 # -vsp_use_cost_heuristics=$USE_HEUR 45 46 #sh movefiles.sh $LOG_PREFIX-$METHOD 25 SCENE_FILENAME=$SCENE_PATH/$SCENE.$EXT 47 26 48 27 ####################################################### … … 54 33 55 34 $PROGRAM $ENVIRONMENT \ 56 -scene_filename=$SCENE_ PATH/$SCENE \35 -scene_filename=$SCENE_FILENAME \ 57 36 -view_cells_sampling_type=object_directional \ 58 37 -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ … … 82 61 83 62 $PROGRAM $ENVIRONMENT \ 84 -scene_filename=$SCENE_ PATH/$SCENE \63 -scene_filename=$SCENE_FILENAME \ 85 64 -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 86 65 -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ … … 106 85 107 86 $PROGRAM $ENVIRONMENT \ 108 -scene_filename=$SCENE_ PATH/$SCENE \87 -scene_filename=$SCENE_FILENAME \ 109 88 -view_cells_evaluation_stats_prefix=$LOG_PREFIX-$METHOD \ 110 89 -view_cells_merge_stats=$LOG_PREFIX-$METHOD-mergeStats.log \ -
GTP/trunk/Lib/Vis/Preprocessing/src/HierarchyManager.cpp
r2231 r2232 853 853 if (avgRaysPerObjects <= mMinAvgRaysPerObject) 854 854 { 855 cout << "t ";// << avgRaysPerObjects << " ";855 //cout << "t ";// << avgRaysPerObjects << " "; 856 856 return totalPvs; 857 857 } … … 872 872 const float newPvs = alpha * childPvs + (1.0f - alpha) * totalPvs; 873 873 #endif 874 874 //cout << "b ";// << avgRaysPerObjects << " "; 875 875 //cout << "alpha " << alpha << " beta: " << beta << " child: " << childPvs << " parent: " << totalPvs << endl; 876 876 … … 896 896 if (!success) // split was not taken 897 897 { 898 cout << "x";898 //cout << "x"; 899 899 return false; 900 900 } -
GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.icproj
r2228 r2232 278 278 IntermediateDirectory="Release" 279 279 ConfigurationType="4" 280 CharacterSet="2"/> 280 CharacterSet="2" 281 WholeProgramOptimization="1"/> 281 282 <Tool 282 283 Name="DebugTool"/> … … 313 314 <Tool 314 315 Name="LibrarianTool" 315 OutputFile="../lib/Release/ $(ProjectName).lib"/>316 OutputFile="../lib/Release/Preprocessor.lib"/> 316 317 <Tool 317 318 Name="ResCmplrTool"/> -
GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.vcproj
r2228 r2232 206 206 <Configuration 207 207 Name="Release Internal|Win32" 208 OutputDirectory=" Release"209 IntermediateDirectory=" Release"208 OutputDirectory="..\libRelease" 209 IntermediateDirectory="...\obj\Release" 210 210 ConfigurationType="4" 211 211 CharacterSet="2"> … … 238 238 <Tool 239 239 Name="VCLibrarianTool" 240 OutputFile="../lib/Release/ $(ProjectName).lib"/>240 OutputFile="../lib/Release/Preprocessor.lib"/> 241 241 <Tool 242 242 Name="VCMIDLTool"/> … … 260 260 <Configuration 261 261 Name="release_noqt|Win32" 262 OutputDirectory=" Release"263 IntermediateDirectory=" Release"262 OutputDirectory="..\lib\Release" 263 IntermediateDirectory="..\obj\Release" 264 264 ConfigurationType="4" 265 CharacterSet="2"> 265 CharacterSet="2" 266 WholeProgramOptimization="TRUE"> 266 267 <Tool 267 268 Name="VCCLCompilerTool" … … 273 274 OmitFramePointers="TRUE" 274 275 EnableFiberSafeOptimizations="TRUE" 276 WholeProgramOptimization="TRUE" 275 277 OptimizeForProcessor="1" 276 278 OptimizeForWindowsApplication="TRUE" … … 293 295 <Tool 294 296 Name="VCLibrarianTool" 295 OutputFile="../lib/Release/ $(ProjectName).lib"/>297 OutputFile="../lib/Release/Preprocessor.lib"/> 296 298 <Tool 297 299 Name="VCMIDLTool"/> … … 315 317 <Configuration 316 318 Name="Release_Qt|Win32" 317 OutputDirectory=" $(ConfigurationName)"318 IntermediateDirectory=" $(ConfigurationName)"319 OutputDirectory="..\lib\Release" 320 IntermediateDirectory="..\obj\Release" 319 321 ConfigurationType="4" 320 322 CharacterSet="2"> … … 1166 1168 </File> 1167 1169 <File 1170 RelativePath=".\sparsehash\src\google\sparsehash\hash_fun.h"> 1171 </File> 1172 <File 1168 1173 RelativePath=".\sparsehash\src\windows\hash_fun.h"> 1169 </File>1170 <File1171 RelativePath=".\sparsehash\src\google\sparsehash\hash_fun.h">1172 1174 </File> 1173 1175 <File -
GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.icproj
r2228 r2232 252 252 <Tool 253 253 Name="GeneralTool" 254 OutputDirectory="$(ConfigurationName)" 255 IntermediateDirectory="$(ConfigurationName)" 256 ConfigurationType="1" 257 CharacterSet="2"/> 254 OutputDirectory="Release" 255 IntermediateDirectory="Release" 256 ConfigurationType="1" 257 CharacterSet="2" 258 WholeProgramOptimization="0"/> 258 259 <Tool 259 260 Name="DebugTool"/> … … 286 287 OutputFile="../bin/release/Preprocessor.exe" 287 288 LinkIncremental="1" 288 AdditionalLibraryDirectories="..\src\GL;..\lib\release;..\..\Preprocessing\lib\release;..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;..\MultiLevelRayTracing\RTScene\Release;..\MultiLevelRayTracing\RTWorld\Release ;"$(QTDIR)\lib";.\QtGlRenderer\Release"289 AdditionalLibraryDirectories="..\src\GL;..\lib\release;..\..\Preprocessing\lib\release;..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;..\MultiLevelRayTracing\RTScene\Release;..\MultiLevelRayTracing\RTWorld\Release" 289 290 GenerateDebugInformation="0" 290 291 SubSystem="1" -
GTP/trunk/Lib/Vis/Preprocessing/src/TestPreprocessor.vcproj
r2231 r2232 183 183 <Configuration 184 184 Name="Release Internal|Win32" 185 OutputDirectory=" bin\Release"186 IntermediateDirectory=" bin\Release"185 OutputDirectory="..\bin\Release" 186 IntermediateDirectory="..\obj\Release" 187 187 ConfigurationType="1" 188 188 CharacterSet="2" … … 249 249 <Configuration 250 250 Name="release_noqt|Win32" 251 OutputDirectory="$(ConfigurationName)" 252 IntermediateDirectory="$(ConfigurationName)" 253 ConfigurationType="1" 254 CharacterSet="2"> 251 OutputDirectory="..\bin\Release" 252 IntermediateDirectory="..\obj\Release" 253 ConfigurationType="1" 254 CharacterSet="2" 255 WholeProgramOptimization="FALSE"> 255 256 <Tool 256 257 Name="VCCLCompilerTool" … … 262 263 OmitFramePointers="TRUE" 263 264 EnableFiberSafeOptimizations="TRUE" 265 WholeProgramOptimization="FALSE" 264 266 OptimizeForProcessor="1" 265 267 OptimizeForWindowsApplication="TRUE" … … 280 282 OutputFile="../bin/release/Preprocessor.exe" 281 283 LinkIncremental="1" 282 AdditionalLibraryDirectories="..\src\GL;..\lib\release;..\..\Preprocessing\lib\release;..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;..\MultiLevelRayTracing\RTScene\Release;..\MultiLevelRayTracing\RTWorld\Release ;"$(QTDIR)\lib";.\QtGlRenderer\Release"284 AdditionalLibraryDirectories="..\src\GL;..\lib\release;..\..\Preprocessing\lib\release;..\..\..\..\..\..\NonGTP\Boost\lib;..\..\..\..\..\..\NonGTP\Xerces\xercesc\lib;..\..\..\..\..\..\NonGTP\Zlib\lib;..\..\..\..\..\..\NonGTP\Devil\lib;..\MultiLevelRayTracing\RTScene\Release;..\MultiLevelRayTracing\RTWorld\Release" 283 285 GenerateDebugInformation="FALSE" 284 286 SubSystem="1" … … 311 313 <Configuration 312 314 Name="Release_Qt|Win32" 313 OutputDirectory=" $(ConfigurationName)"314 IntermediateDirectory=" $(ConfigurationName)"315 OutputDirectory="..\bin\Release" 316 IntermediateDirectory="..\obj\Release" 315 317 ConfigurationType="1" 316 318 CharacterSet="2"> -
GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.cpp
r2231 r2232 77 77 mViewCellsTree(viewCellsTree), 78 78 mUsePredefinedViewCells(false), 79 mMixtureDistribution(NULL) 79 mMixtureDistribution(NULL), 80 mEvaluationSamples(0) 80 81 { 81 82 mViewSpaceBox.Initialize(); … … 96 97 SimpleRayContainer rays; 97 98 rays.reserve(samplesPerPass); 98 passSamples.reserve(samplesPerPass * 2);99 //passSamples.reserve(samplesPerPass * 2); 99 100 100 101 long startTime = GetTime(); 101 102 102 //cout<<"Progress :"<<i/1e6f<<"M rays, "<<(100.0f*i)/mTotalSamples<<"%"<<endl;103 cout<<"Progress :"<<totalRays / 1e6f << " M rays, " << (100.0f * totalRays) / (mEvaluationSamples + 1) << "%" << endl; 103 104 104 105 //rays.clear(); … … 120 121 "#Pass\n" << pass ++ <<endl<< 121 122 "#Time\n" << time <<endl<< 122 "#TotalSamples\n" << totalRays<<endl;123 "#TotalSamples\n" << totalRays << endl; 123 124 124 125 … … 6820 6821 { 6821 6822 int samplesPerPass; 6822 int numSamples;6823 6823 int castSamples = 0; 6824 6824 int oldSamples = 0; … … 6830 6830 Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.samplesPerPass", samplesPerPass); 6831 6831 Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.samplesForStats", samplesForStats); 6832 Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.samples", numSamples);6832 Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.samples", mEvaluationSamples); 6833 6833 Environment::GetSingleton()->GetStringValue("ViewCells.Evaluation.statsPrefix", statsPrefix); 6834 6834 Environment::GetSingleton()->GetIntValue("ViewCells.Evaluation.stepSize", splitsStepSize); … … 6842 6842 Debug << "step size: " << splitsStepSize << endl; 6843 6843 Debug << "view cell evaluation samples per pass: " << samplesPerPass << endl; 6844 Debug << "view cell evaluation samples: " << numSamples << endl;6844 Debug << "view cell evaluation samples: " << mEvaluationSamples << endl; 6845 6845 Debug << "view cell stats prefix: " << statsPrefix << endl; 6846 6846 … … 6855 6855 int pass = 0; 6856 6856 6857 while (castSamples < numSamples)6857 while (castSamples < mEvaluationSamples) 6858 6858 { 6859 6859 /////////////// … … 6882 6882 6883 6883 if ((castSamples >= samplesForStats + oldSamples) || 6884 (castSamples >= numSamples))6884 (castSamples >= mEvaluationSamples)) 6885 6885 { 6886 6886 oldSamples += samplesForStats; -
GTP/trunk/Lib/Vis/Preprocessing/src/ViewCellsManager.h
r2227 r2232 839 839 int mVisualizationSamples; 840 840 841 int mEvaluationSamples; 842 841 843 float mTotalAreaValid; 842 844 float mTotalArea;
Note: See TracChangeset
for help on using the changeset viewer.