Changeset 1995 for GTP

Timestamp:

01/18/07 20:04:20 (18 years ago)

Author:

bittner

Message:

mutation tests

Location:

GTP/trunk/Lib/Vis/Preprocessing/src

Files:

• AxisAlignedBox3.h (modified) (1 diff)
• KdTree.cpp (modified) (3 diffs)
• Makefile (modified) (1 diff)
• Mutation.cpp (modified) (1 diff)
• SamplingStrategy.h (modified) (1 diff)

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

@@ -73 +73 @@
   // the size of the box along all the axes
   Vector3 Size() const;
-
+  float Radius() const { return 0.5f*Magnitude(Size()); }
+  float SqrRadius() const { return 0.5f*SqrMagnitude(Size()); }
+  
   // Return whether the box is unbounded.  Unbounded boxes appear
   // when unbounded objects such as quadric surfaces are included.

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

@@ -1464 +1464 @@
   nodeStack.push(mRoot);
 
+  float area = 0.0f;
+  float radius = 0.0f;
+  int nodes = 0;
+  
   while (!nodeStack.empty()) {
     KdNode *node = nodeStack.top();
@@ -1470 +1474 @@
         node->mPvsTermination = 0;
         if (node->IsLeaf() || (GetSurfaceArea(node) <= maxArea) ) {
+          area += GetSurfaceArea(node);
+          radius += GetBox(node).Radius();
+          nodes++;
           node->mPvsTermination = 1;
           // create dummy kd intersectable
@@ -1479 +1486 @@
     }
   }
+
+  if (nodes) {
+        area /= nodes;
+        radius /= nodes;
+        cout<<"Number of nodes for storing in the PVS = "<<nodes<<endl;
+        cout<<"Average rel. node area = "<<area/GetSurfaceArea(mRoot)<<endl;
+        cout<<"Average rel. node radius = "<<radius/GetBox(mRoot).Radius()<<endl;
+        cout<<"Avg node radius = "<<radius<<endl;
+  }
+  
 }
 

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

@@ -1 +1 @@
 #############################################################################
 # Makefile for building: preprocessor
-# Generated by qmake (2.00a) (Qt 4.1.2) on: st 17. I 15:41:45 2007
+# Generated by qmake (2.00a) (Qt 4.1.2) on: ?t 18. I 16:30:52 2007
 # Project:  preprocessor.pro
 # Template: app

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

@@ -369 +369 @@
   Vector3 origin = ray->mOrigin;
   Vector3 termination = ray->mTermination; //box.Center(); //ray->mTermination; //box.Center();
+
+  // optimal for Pompeii 0.1f
+  // optimal for Vienna 0.5f
   
   float radiusExtension = 0.05f;
   //  + mRays[index].mMutations/50.0f;
+
+  float mutationRadius = objectRadius*radiusExtension;
+
+  // tmp for pompeii
+  mutationRadius = 0.22f;
   
   origin += ComputeOriginMutation(*ray, U, V,
                                                                   Vector2(rr[0], rr[1]),
-                                                                  objectRadius*radiusExtension);
+                                                                  mutationRadius);
   
   termination += ComputeTerminationMutation(*ray, U, V,
                                                                                         Vector2(rr[2], rr[3]),
-                                                                                        objectRadius*radiusExtension);
+                                                                                        mutationRadius);
   
   Vector3 direction = termination - origin;

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

@@ -271 +271 @@
 private:
 
-        virtual bool GenerateSample(SimpleRay &ray);
+  virtual bool GenerateSample(SimpleRay &ray) { return false; }
 
         ViewCell *mViewCell;