Changeset 2100 for GTP/trunk/Lib/Vis/Preprocessing

Timestamp:

02/07/07 17:43:56 (17 years ago)

Author:

mattausch

Message:

worked on pvs

Location:

GTP/trunk/Lib/Vis/Preprocessing

Files:

• EvalStats/EvalStats.vcproj (modified) (1 diff)
• src/OspTree.cpp (modified) (1 diff)
• src/Preprocessor.vcproj (modified) (4 diffs)
• src/Pvs.h (modified) (14 diffs)
• src/ViewCell.cpp (modified) (3 diffs)
• src/ViewCellsManager.cpp (modified) (2 diffs)

GTP/trunk/Lib/Vis/Preprocessing/EvalStats/EvalStats.vcproj

@@ -205 +205 @@
                         <Tool
                                 Name="VCCLCompilerTool"
-                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
-                                RuntimeLibrary="0"
-                                UsePrecompiledHeader="3"
-                                WarningLevel="3"
-                                Detect64BitPortabilityProblems="TRUE"
-                                DebugInformationFormat="3"/>
-                        <Tool
-                                Name="VCCustomBuildTool"/>
-                        <Tool
-                                Name="VCLinkerTool"
-                                OutputFile="$(OutDir)/EvalStats.exe"
-                                LinkIncremental="1"
-                                GenerateDebugInformation="TRUE"
-                                SubSystem="1"
-                                OptimizeReferences="2"
-                                EnableCOMDATFolding="2"
+                                Optimization="3"
+                                GlobalOptimizations="TRUE"
+                                InlineFunctionExpansion="2"
+                                EnableIntrinsicFunctions="TRUE"
+                                FavorSizeOrSpeed="1"
+                                OmitFramePointers="TRUE"
+                                EnableFiberSafeOptimizations="TRUE"
+                                OptimizeForProcessor="3"
+                                OptimizeForWindowsApplication="TRUE"
+                                PreprocessorDefinitions="WIN32;NDEBUG;_CONSOLE"
+                                RuntimeLibrary="0"
+                                UsePrecompiledHeader="3"
+                                WarningLevel="3"
+                                Detect64BitPortabilityProblems="TRUE"
+                                DebugInformationFormat="3"/>
+                        <Tool
+                                Name="VCCustomBuildTool"/>
+                        <Tool
+                                Name="VCLinkerTool"
+                                OutputFile="$(OutDir)/EvalStats.exe"
+                                LinkIncremental="1"
+                                GenerateDebugInformation="TRUE"
+                                SubSystem="1"
+                                OptimizeReferences="2"
+                                EnableCOMDATFolding="2"
+                                OptimizeForWindows98="1"
                                 TargetMachine="1"/>
                         <Tool

GTP/trunk/Lib/Vis/Preprocessing/src/OspTree.cpp

@@ -392 +392 @@
         // This is important during the subdivision
 
-//MailablePvsData::NewMail();
+        //MailablePvsData::NewMail();
         UpdateViewCellsPvs(front, *frontData.mRays);
         UpdateViewCellsPvs(back, *backData.mRays);

GTP/trunk/Lib/Vis/Preprocessing/src/Preprocessor.vcproj

@@ -206 +206 @@
                 <Configuration
                         Name="Release Internal|Win32"
-                        OutputDirectory="$(ConfigurationName)"
-                        IntermediateDirectory="$(ConfigurationName)"
+                        OutputDirectory="Release"
+                        IntermediateDirectory="Release"
                         ConfigurationType="4"
                         CharacterSet="2">
@@ -419 +419 @@
                         </File>
                         <File
+                                RelativePath=".\DefaultPvs.h">
+                        </File>
+                        <File
                                 RelativePath="..\src\dual_depth.cg">
                         </File>
@@ -482 +485 @@
                         </File>
                         <File
+                                RelativePath=".\HashPvs.h">
+                        </File>
+                        <File
                                 RelativePath=".\HierarchyManager.cpp">
                         </File>
@@ -750 +756 @@
                         <File
                                 RelativePath="..\src\Pvs.h">
+                        </File>
+                        <File
+                                RelativePath=".\PvsBase.h">
                         </File>
                         <File

GTP/trunk/Lib/Vis/Preprocessing/src/Pvs.h

@@ -106 +106 @@
         }
 
-        ////////////////////////////
+        ///////////////
         //  Mailing stuff
 
@@ -172 +172 @@
 {
         template<typename T, typename S>
-        friend class PvsIterator;
+                friend class PvsIterator;
 
 public:
-  
+
         Pvs(): mSamples(0), mEntries(), mLastSorted(0), mQueriesSinceSort(0) {}
 
         /** creates pvs and initializes it with the given entries. 
-                Assumes that entries are sorted-
+        Assumes that entries are sorted-
         */
         Pvs(const vector<PvsEntry<T, S> > &samples);
@@ -186 +186 @@
         /** Compresses PVS lossless or lossy.
         */
-        int Compress() {return 0;}
-        int GetSize() const {return (int)mEntries.size();}
-        bool Empty() const {return mEntries.empty();}
-
-        void Reserve(const int n) { mEntries.reserve(n); }
+        int Compress() 
+        {
+                return 0;
+        }
+        
+        int GetSize() const 
+        {
+                return (int)mEntries.size();
+        }
+        
+        bool Empty() const 
+        {
+                return mEntries.empty();
+        }
+
+        void Reserve(const int n) 
+        { 
+                mEntries.reserve(n); 
+        }
 
         /** Normalize the visibility of entries in order to get 
-                comparable results.
+        comparable results.
         */
         void NormalizeMaximum();
 
         /** Merges pvs of a into this pvs.
-                Warning: very slow!
+        Warning: very slow!
         */
         void MergeInPlace(const Pvs<T, S> &a);
 
         /** Difference of pvs to pvs b.
-                @returns number of different entries.
+        @returns number of different entries.
         */
         int Diff(const Pvs<T, S> &b);
@@ -209 +223 @@
         /** Finds sample in PVS.
                 @param checkDirty if dirty part of the pvs should be checked for entry 
-                        (warning: linear runtime in dirty part)
+                (warning: linear runtime in dirty part)
                 @returns iterator on the sample if found, else the place where 
-                        it would be added in the sorted vector.
+                it would be added in the sorted vector.
         */
         bool Find(T sample,
@@ -239 +253 @@
         void Sort();
 
-  /** Sort pvs entries assume that the pvs contains unique entries
-   */
-  void SimpleSort();
-
-        /** Adds sample to PVS. Assumes that the pvs is sorted
-                @returns contribution of sample (0 or 1)
-        */
-        //float AddSamples(const vector<PvsEntry<T, S> > &samples);
+        /** Sort pvs entries assume that the pvs contains unique entries
+        */
+        void SimpleSort();
 
         /** Adds sample to PVS.
@@ -269 +278 @@
 
         /** Removes sample from PVS if reference count is zero.
-                @param visibleSamples number of references to be removed
+        @param visibleSamples number of references to be removed
         */
         bool RemoveSample(T sample, const float pdf);
@@ -293 +302 @@
 
         static void Merge(Pvs<T, S> &mergedPvs, const Pvs<T, S> &a, const Pvs<T, S> &b);
+
+        int GetSamples() const
+        {
+                return mSamples;
+        }
+
+        bool IsDirty() const
+        {
+                return mLastSorted < mEntries.size();
+        }
+
+        bool RequiresResort() const
+        {
+                // the last part should not be more than log of the sorted part. this
+                // way we can achieve logarithmic behaviour for insertion and find
+                const int n = mEntries.size();
+                const int dirtySize = n - mLastSorted;
+
+#define LOG2E 1.442695040f
+
+                const float logN = log((float)max(1, n))/LOG2E;
+                const float logS = log((float)max(1, mLastSorted))/LOG2E;
+                const float logD = log((float)max(1, dirtySize))/LOG2E;
+
+                if (8*(n + 2*dirtySize*logD) <
+                        mQueriesSinceSort*((mLastSorted*logS + dirtySize*dirtySize/2)/n - logN)) 
+                {
+                                //              cout<<"Q="<<mQueriesSinceSort<<" N="<<n<<" D="<<dirtySize<<endl;
+                        return true;
+                }
+                
+                return false;
+        }
+
+        bool RequiresResortLog() const
+        {
+                // the last part should not be more than log of the sorted part. this
+                // way we can achieve logarithmic behaviour for insertion and find
+                const int dirtySize = (int)mEntries.size() - mLastSorted;
+                return dirtySize > 4 * (int)(log((double)mEntries.size()) / log(2.0));
+        }
+
+
+        int GetLastSorted() const
+        {
+                return mLastSorted;
+        }
+
+        typename PvsIterator<T, S> GetIterator() const;
+
+protected:
 
         static void Merge(Pvs<T, S> &mergedPvs, 
@@ -302 +362 @@
                                           const int bSamples);
 
-        int GetSamples() const
-        {
-                return mSamples;
-        }
-
-
-        bool IsDirty() const
-        {
-                return mLastSorted < mEntries.size();
-        }
-
-        bool RequiresResort() const
-        {
-          // the last part should not be more than log of the sorted part. this
-          // way we can achieve logarithmic behaviour for insertion and find
-          const int n = mEntries.size();
-          const int dirtySize = n - mLastSorted;
-
-#define LOG2E 1.442695040f
-          
-          const float logN = log((float)max(1, n))/LOG2E;
-          const float logS = log((float)max(1, mLastSorted))/LOG2E;
-          const float logD = log((float)max(1, dirtySize))/LOG2E;
-          
-          if (8*(n + 2*dirtySize*logD) <
-                  mQueriesSinceSort*((mLastSorted*logS + dirtySize*dirtySize/2)/n - logN)) {
-                //              cout<<"Q="<<mQueriesSinceSort<<" N="<<n<<" D="<<dirtySize<<endl;
-                return true;
-          }
-          return false;
-        }
-
-  bool RequiresResortLog() const
-  {
-        // the last part should not be more than log of the sorted part. this
-        // way we can achieve logarithmic behaviour for insertion and find
-        const int dirtySize = (int)mEntries.size() - mLastSorted;
-        return dirtySize > 4*(int)(log((double)mEntries.size()) / log(2.0));
-  }
-  
-  
-        int GetLastSorted() const
-        {
-                return mLastSorted;
-        }
-
-        typename PvsIterator<T, S> GetIterator() const;
-
-protected:
-
         /// vector of PVS entries
         vector<PvsEntry<T, S> > mEntries; 
-        
+
         /// Number of samples used to create the PVS
         int mSamples;
-  
+
         /// Last sorted entry in the pvs (important for find and merge)
         int mLastSorted;
 
-  int mQueriesSinceSort;
+        int mQueriesSinceSort;
 };
 
@@ -379 +389 @@
 {
         std::vector<PvsEntry<T, S> >::iterator it = mEntries.begin() + mLastSorted;
-        //std::vector<PvsEntry<T, S> >::const_iterator it = mEntries.begin() + mLastSorted;
         std::vector<PvsEntry<T, S> >::iterator it_end = mEntries.end();
 
@@ -385 +394 @@
         std::vector<PvsEntry<T, S> >::iterator newEnd = unique(it, it_end);
         sort(it, newEnd);
-        //sort(mEntries.begin(), mEntries.end());
         
         // now merge sorted ranges
@@ -452 +460 @@
                 const float diff = bSumPdf - aSumPdf;
 
-                if (diff > 0.0f) {
+                if (diff > 0.0f) 
+                {
                         pvsEnlargement += diff;
-                } else {
+                } 
+                else 
+                {
                         pvsReduction += -diff;
                 }
 #else
                 if (!entryFound)
+                {
                         pvsEnlargement += 1.0f;
+                }
 #endif
         }
@@ -467 +480 @@
                 float aSumPdf = (*it).mData.mSumPdf;
                 float bSumPdf = 0.0f;
-                if (aSumPdf < 0.0f) {
-                
+                if (aSumPdf < 0.0f) 
+                {
                         // this entry was already accounted for!
                         // just revert it back
                         (*it).mData.mSumPdf = -aSumPdf;
-                } else {
+                } 
+                else 
+                {
                         vector<PvsEntry<T, S> >::iterator oit;
                 
@@ -592 +607 @@
                                 mergedPvs.mEntries.push_back(*bit);
                         }
-                        
-                        //bObjOld = bObj;
                 }
 
@@ -669 +682 @@
 }
 
-/*
-template <typename T, typename S> 
-bool Pvs<T, S>::Find(T sample,
-                                         typename vector<PvsEntry<T, S> >::iterator &it,
-                                         const bool checkDirty)
-{
-        PvsEntry<T, S> dummy(sample, PvsData());
-        mQueriesSinceSort++;
-
-        // only check clean part
-        vector<PvsEntry<T, S> >::iterator sorted_end = mEntries.begin() + mLastSorted;
-
-        // binary search
-        it = lower_bound(mEntries.begin(), sorted_end, dummy);
-
-        if ((it != mEntries.end()) && ((*it).mObject == sample))
-                return true;
-
-        // sample not found yet => search further in the unsorted part
-        if (checkDirty) 
-        {
-                for (it = sorted_end; (it != mEntries.end()) && ((*it).mObject != sample); ++ it);
-
-                if (it != mEntries.end())
-                        return true;
-        }
-
-        return false;
-}
-*/
 
 template <typename T, typename S>

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

@@ -1162 +1162 @@
 
 
-inline int AddedPvsSize(ObjectPvs pvs1, const ObjectPvs &pvs2)
+inline int AddedPvsSize(const ObjectPvs &pvs1, const ObjectPvs &pvs2)
 {
         ObjectPvs interPvs;
@@ -2267 +2267 @@
 
         int entriesInPvs = rootEntries;
-    const int entryStorage = sizeof(PvsData) + sizeof(int); // one entry into the pvs
+        // one entry into the pvs
+    const int entryStorage = sizeof(PvsData) + sizeof(int); 
 
         storageFunction.push_back(rootEntries);
@@ -2319 +2320 @@
         }
 }
-
 
 

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

@@ -27 +27 @@
 #include "PerfTimer.h"
 
+#include "HashPvs.h"
+
 
 
@@ -1543 +1545 @@
                 
                 castSamples += samplesPerPass;
+HashPvs<int> dummy;
 
                 Real timeDiff = TimeDiff(startTime, GetTime());