Changeset 2580 for GTP/trunk/Lib/Vis/Preprocessing/src

Timestamp:

01/09/08 10:22:15 (16 years ago)

Author:

mattausch

Message:

 

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• CombinedPreprocessor.cpp (modified) (4 diffs)
• Preprocessor.cpp (modified) (3 diffs)
• Preprocessor.h (modified) (1 diff)
• QtInterface/LogReader.cpp (modified) (4 diffs)
• QtInterface/LogReader.h (modified) (2 diffs)
• QtInterface/LogWriter.cpp (modified) (5 diffs)
• QtInterface/LogWriter.h (modified) (1 diff)
• QtInterface/QtGlRenderer.cpp (modified) (12 diffs)
• QtInterface/QtGlRenderer.h (modified) (8 diffs)
• SamplingStrategy.cpp (modified) (2 diffs)

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

@@ -76 +76 @@
   long startTime = GetTime();
 
-  for (int i=0; i < mTotalSamples; i += mSamplesPerPass, mPass++) {
+  mCurrentSamples = 0;
+
+  for (mCurrentSamples =0; mCurrentSamples < mTotalSamples; mCurrentSamples += mSamplesPerPass, mPass++) {
         mRayCaster->InitPass();
         
-        cout<<"Progress :"<<i/1e6f<<"M rays, "<<(100.0f*i)/mTotalSamples<<"%"<<endl;
+        cout<<"Progress :"<<mCurrentSamples/1e6f<<"M rays, "<<(100.0f*mCurrentSamples)/mTotalSamples<<"%"<<endl;
         
         rays.clear();
@@ -122 +124 @@
         mMixtureDistribution->UpdateDistributions(vssRays);
         
-        if (i - lastEvaluation >= mSamplesPerEvaluation) {
+        if (mCurrentSamples - lastEvaluation >= mSamplesPerEvaluation) {
           Real time = TimeDiff(startTime, GetTime());
           mViewCellsManager->PrintPvsStatistics(mStats);
@@ -128 +130 @@
                 "#Pass\n" <<mPass<<endl<<
                 "#Time\n" << time <<endl<<
-                "#TotalSamples\n" <<i<<endl<<
+                "#TotalSamples\n" << mCurrentSamples <<endl<<
                 "#RssSamples\n" <<mTotalRaysCast<<endl;
 
@@ -143 +145 @@
           }
           
-          lastEvaluation = i;
+          lastEvaluation = mCurrentSamples;
           
           if (renderer) {

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

@@ -20 +20 @@
 #include "VssRay.h"
 #include "IntelRayCaster.h"
+#if TODO
 #include "HavranRayCaster.h"
+#endif
 #include "InternalRayCaster.h"
 #include "GlobalLinesRenderer.h"
@@ -1059 +1061 @@
           //HavranRayCaster *hr =
           //  dynamic_cast<HavranRayCaster*>(mRayCaster);
+#if TODO
           HavranRayCaster *hr =
             reinterpret_cast<HavranRayCaster*>(mRayCaster);
           hr->Build(this->mObjects);
+#endif
           return true;
         }       
@@ -1149 +1153 @@
         if (rayCastMethod == 2) 
         {
-          cout << "ray cast method: havran" << endl;
+#if TODO
+                cout << "ray cast method: havran" << endl;
           mRayCaster = new HavranRayCaster(*this);
+#endif
         }
         

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

@@ -259 +259 @@
 
         int mTotalSamples;
+        int mCurrentSamples;
+
         int mTotalTime;
         int mSamplesPerPass;
         int mSamplesPerEvaluation;
-  
-  int mTotalRaysCast;
+ 
+        int mTotalRaysCast;
 
         RayCaster *mRayCaster;

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/LogReader.cpp

@@ -12 +12 @@
 
 
-void LogReader::Read(ViewCellHistoryContainer &history)
+/*void LogReader::Read(ViewCellHistoryContainer &history)
 {
-        /*std::vector<int>::const_iterator it, it_end = numSamples.end();
-
-        for (it = numSamples.begin(); it != it_end; ++ it)
-        {
-                int numSamples = *it;
-
-                Read(numSamples, infos);
-                }*/
-
         int numViewCells, numSamples;
     
@@ -49 +40 @@
                 src.close();
         }
-}
+}*/
 
 
-/*void LogReader::Read(const int numSamples, ViewCellInfoContainer &infos)
+void LogReader::Read(const int numSamples, ViewCellInfoContainer &infos)
 {
          char filename[64]; 
-         sprintf(filename, "%s %06d", mFilename.c_str(), numSamples);
+         //sprintf(filename, "%s %06d", mFilename.c_str(), numSamples);
         
          // open file
-         std::ifstream src(filename);
+         std::ifstream src(mFilename.c_str());
 
          if (src.is_open())
@@ -65 +56 @@
                  {
                          ViewCellInfo info;
-
                          src >> info.mPiercingRays;     
 
@@ -76 +66 @@
                  src.close();
          }
-}*/
+}
 
 }

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/LogReader.h

@@ -21 +21 @@
 
 typedef std::vector<ViewCellInfo> ViewCellInfoContainer;
-typedef std::map<int, ViewCellInfoContainer *> ViewCellHistoryContainer;
+//typedef std::map<int, ViewCellInfoContainer *> ViewCellHistoryContainer;
 
-
-/*struct ViewCellHistory;
-{
-}*/
 
 class LogReader
@@ -34 +30 @@
         /** Reads the info for several #samples.
         */
-        void Read(ViewCellHistoryContainer &history);
-        /** Reads the viewcells info after specific #samples.
+        //void Read(ViewCellHistoryContainer &history);
+        /** Reads the viewcells info from disc
         */
         void Read(const int numSamples, ViewCellInfoContainer &infos);

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/LogWriter.cpp

@@ -7 +7 @@
 
 
+LogWriter::LogWriter()
+{
+}
+
+
+LogWriter::LogWriter(const std::string &filename): mFilename(filename)
+{
+}
+
+
 void LogWriter::SetFilename(const std::string &filename)
 {
@@ -13 +23 @@
 
 
-void LogWriter::Write(ofstream &myfile, const int numSamples, const ViewCellInfoContainer &infos)
+void LogWriter::Write(//ofstream &myfile, 
+                                          const int numSamples, const ViewCellInfoContainer &infos)
 {
+        ofstream myfile;
+        myfile.open(mFilename.c_str());
+
+        if (!myfile.is_open())
+                myfile.open(mFilename.c_str());
+
         ViewCellInfoContainer::const_iterator vit, vit_end = infos.end();
 
@@ -25 +42 @@
 }
 
-
+/*
 void LogWriter::Write(const ViewCellHistoryContainer &hist)
 {
-        ofstream myfile;
-
+        //ofstream myfile;
         //char filename[64]; 
         //sprintf(filename, "%s %06d", mFilename.c_str(), numSamples);
         //myfile.open(filename);
-        myfile.open(mFilename.c_str());
+        if (!mFile.is_open())
+                mFile.open(mFilename.c_str());
 
         ViewCellHistoryContainer::const_iterator vit, vit_end = hist.end();
@@ -39 +56 @@
         // number of samples
         //myfile << "samples: " << numSamples << endl;
-        myfile << (int)hist.size() << endl;
+        mFile << (int)hist.size() << endl;
 
         for (vit = hist.begin(); vit != vit_end; ++ vit)
@@ -47 +64 @@
 }
 
+*/
+
 }

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/LogWriter.h

@@ -17 +17 @@
 class LogWriter
 {
+public:
+
+        LogWriter();
+        LogWriter(const std::string &filename);
         void SetFilename(const std::string &filename);
 
         //void Write(const int numSamples, const ViewCellContainer &viewcells);
-        void Write(std::ofstream &myfile, const int numSamples, const ViewCellInfoContainer &infos);
-        void Write(const ViewCellHistoryContainer &hist);
+        void Write(//std::ofstream &myfile, 
+                                const int numSamples, const ViewCellInfoContainer &infos);
+        //void Write(const ViewCellHistoryContainer &hist);
 
 protected:
 
+        //std::ofstream mFile;
         std::string mFilename;
 };

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

@@ -16 +16 @@
 #include "Material.h"
 #include "IntersectableWrapper.h"
+#include "LogWriter.h"
 
 
@@ -44 +45 @@
 QtGlDebuggerWidget *debuggerWidget = NULL;
 
+const static int SAMPLES_INCR = 2000000;
 
 static inline bool ilt(Intersectable *obj1, Intersectable *obj2)
@@ -860 +862 @@
         mUseFilter = tmp;
 
-        Environment::GetSingleton()->GetBoolValue("Preprocessor.applyVisibilitySpatialFilter",
-                tmp );
+        Environment::GetSingleton()->GetBoolValue("Preprocessor.applyVisibilitySpatialFilter", tmp );
         mUseSpatialFilter = tmp;
+
+        //mLogWriter = new LogWriter("myfile.out");
 
         mShowRenderCost = false;
         mShowPvsSizes = false;
+        mShowComparison = false;
         mShowPiercingRays = false;
         mShowWeightedRays = false;
@@ -879 +883 @@
         mShowRays = false;
 
+        mNextSamples = SAMPLES_INCR;
         mControlWidget = new QtRendererControlWidget(NULL);
 
@@ -904 +909 @@
         connect(mControlWidget, SIGNAL(SetUseTransparency(bool)), this, SLOT(SetUseTransparency(bool)));
         connect(mControlWidget, SIGNAL(SetShowPvsSizes(bool)), this, SLOT(SetShowPvsSizes(bool)));
+        connect(mControlWidget, SIGNAL(SetShowComparison(bool)), this, SLOT(SetShowComparison(bool)));
         connect(mControlWidget, SIGNAL(SetTopView(bool)), this, SLOT(SetTopView(bool)));
         connect(mControlWidget, SIGNAL(SetCutViewCells(bool)), this, SLOT(SetCutViewCells(bool)));
@@ -1341 +1347 @@
         int i;
 
-        mRecordHist = false;
-        //mRecordHist = true;
+        //mRecordHist = false;
+        mRecordHist = true;
+        mNextSamples = 2000000;
 
         ViewCellContainer &viewcells = mViewCellsManager->GetViewCells();
-        
-        if (mRecordHist && (mSamples > mNextSamples))
-        {
-                mNextSamples += 2000000;
-
-                ViewCellInfoContainer *newContainer = new ViewCellInfoContainer();
-
-                FillNewContainer(viewcells, *newContainer);
-                mCurrentHist[mNextSamples] = newContainer;
+        const int currentSamples = mViewCellsManager->GetPreprocessor()->mCurrentSamples;
+        //cout << "current samples: " << currentSamples << endl;
+
+        if (mRecordHist && (currentSamples > mNextSamples))
+        {
+                //mNextSamples += SAMPLES_INCR;
+cout<<"************************************************" << endl;
+                cout << "reached " << currentSamples << " samples " << " => writing file" << endl;
+                //ViewCellInfoContainer newContainer;
+
+                mCurrentInfo.clear();
+                FillNewContainer(viewcells, mCurrentInfo);
+                //mCurrentHist[mNextSamples] = newContainer;
+                
+                LogWriter writer;
+                writer.SetFilename("compare.log");
+                writer.Write(mNextSamples, mCurrentInfo);
+                cout << "finished writing file" << endl;
         }
 
@@ -1410 +1426 @@
                 }
 
-                if (mAssignImportanceByRelativeValue)
+                if (!mShowComparison)//mAssignImportanceByRelativeValue)
                         AssignImportanceByRelativeValue(viewcells, maxPvs, maxPiercingRays, maxRelativeRays, maxRcCost);
                 else
                 {
-                        ViewCellInfoContainer *infos1 = mCurrentHist[mCurrentSamples];
-                        ViewCellInfoContainer *infos2 = mCompareHist[mCurrentSamples];
-                        AssignColorByComparison(viewcells, *infos1, *infos2);
-                }
-
+                        mCurrentInfo.clear();
+                        FillNewContainer(viewcells, mCurrentInfo);
+
+                        //ViewCellInfoContainer *infos1 = mCurrentHist[mNextSamples];
+                        //ViewCellInfoContainer *infos2 = mCompareHist[mNextSamples];
+
+                        //AssignColorByComparison(viewcells, *infos1, *infos2);
+                        AssignColorByComparison(viewcells, //mCurrentInfo, 
+                                mCompareInfo);
+                }
 
                 glEnable(GL_DEPTH_TEST);        
@@ -1487 +1508 @@
 
 void QtGlRendererWidget::AssignColorByComparison(const ViewCellContainer &viewcells,
-                                                                                                 const ViewCellInfoContainer &infos1, 
-                                                                                                 const ViewCellInfoContainer &infos2)
-{
-
-        const float maxRatio = 2;
-        const float minRatio = 0.5;
+                                                                                                 //const ViewCellInfoContainer &infos1, 
+                                                                                                 const ViewCellInfoContainer &compareInfo)
+{
+
+        const float maxRatio = 1.0f;
+        const float minRatio = 0.5f;
 
         const float scale = 1.0f / (maxRatio - minRatio);
@@ -1501 +1522 @@
                 ViewCell *vc = viewcells[i];
 
-                ViewCellInfo vc1Info = infos1[i];
-                ViewCellInfo vc2Info = infos2[i];
-
-                const float vcRatio = vc1Info.mPiercingRays / vc2Info.mPiercingRays + Limits::Small;
+                //ViewCellInfo vc1Info = infos1[i];
+                ViewCellInfo vc2Info = compareInfo[i];
+
+                const float vcRatio = vc->GetNumPiercingRays() / vc2Info.mPiercingRays + Limits::Small;
 
                 const float importance = (vcRatio - minRatio) * scale;
@@ -1526 +1547 @@
 /**********************************************************************/
 
-#if 1
+
 QGroupBox *QtRendererControlWidget::CreateVisualizationPanel(QWidget *parent)
 {
@@ -1707 +1728 @@
         cb->setChecked(false);
         connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetShowRays(bool)));
+        
+        cb = new QCheckBox("Show Comparison", hbox);
+        hlayout->addWidget(cb);
+        cb->setChecked(false);
+        connect(cb, SIGNAL(toggled(bool)), SIGNAL(SetShowComparison(bool)));
 
 
@@ -1943 +1969 @@
 
 
-#endif
-
 
 /*********************************************************************/

GTP/trunk/Lib/Vis/Preprocessing/src/QtInterface/QtGlRenderer.h

@@ -41 +41 @@
 struct RenderCostSample;
 
+//class LogWriter;
+
+
 
 class QtGlRendererBuffer : public QObject, public QGLPixelBuffer, public GlRendererBuffer
@@ -124 +127 @@
   void SetShowPiercingRays(bool);
   void SetShowWeightedRays(bool);
+   void SetShowComparison(bool);
   void SetShowWeightedCost(bool);
  
@@ -163 +167 @@
 
         bool mShowPvsSizes;
+        bool mShowComparison;
         float mSpatialFilterSize;
 
+        //LogWriter *mLogWriter;
         Plane3 mSceneCutPlane;
         float mHidingCost;
@@ -180 +186 @@
 
         /// the current number of samples
-        int mSamples;
+        //int mCurrentSamples;
         /// the next number of samples where we record the data
         int mNextSamples;
@@ -192 +198 @@
         unsigned int mIndexBufferSize;
 
-        bool mAssignImportanceByRelativeValue;
+        //bool mAssignImportanceByRelativeValue;
 
         Vector3 mDummyViewPoint;
@@ -202 +208 @@
         int mCurrentSamples;
 
-        ViewCellHistoryContainer mCurrentHist;
-        ViewCellHistoryContainer mCompareHist;
-
+        //ViewCellHistoryContainer mCurrentHist;
+        //ViewCellHistoryContainer mCompareHist;
+
+        ViewCellInfoContainer mCurrentInfo;
+        ViewCellInfoContainer mCompareInfo;
 
         QtGlRendererWidget(SceneGraph *sceneGraph,
-                ViewCellsManager *viewcells,
-                KdTree *tree,
-                QWidget * parent = 0, const QGLWidget * shareWidget = 0, Qt::WFlags f = 0
-                );
+                               ViewCellsManager *viewcells,
+                                           KdTree *tree,
+                                           QWidget * parent = 0, 
+                                           const QGLWidget *shareWidget = 0, 
+                                           Qt::WFlags f = 0);
 
         QtGlRendererWidget() {};
@@ -276 +285 @@
 
         void AssignColorByComparison(const ViewCellContainer &viewcells,
-                                                                 const ViewCellInfoContainer &info1, 
-                                                                 const ViewCellInfoContainer &info2);
+                                                                 //const ViewCellInfoContainer &info1, 
+                                                                 const ViewCellInfoContainer &compareInfo);
 
 
@@ -368 +377 @@
         void SetShowPvsSizes(bool b) {
                 mShowPvsSizes = b;
+                updateGL();
+        }
+
+        void SetShowComparison(bool b) {
+                mShowComparison = b;
                 updateGL();
         }

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

@@ -8 +8 @@
 #include "RssTree.h"
 #include "Mutation.h"
+#if TODO
 #include "FilterBasedDistribution.h"
+#endif
 #include "DifferenceSampling.h"
 
@@ -726 +728 @@
                                         } else
                                           if (strcmp(curr, "filter_based")==0) {
+#if TODO
                                                 mDistributions.push_back(new FilterBasedDistribution(mPreprocessor));
+#endif
                                           }
                                         else if (strcmp(curr, "difference")==0) {