Changeset 1931 for GTP/trunk/Lib/Vis/Preprocessing/src/RssTree.cpp

Timestamp:

01/02/07 16:12:46 (17 years ago)

Author:

bittner

Message:

 

File:

• GTP/trunk/Lib/Vis/Preprocessing/src/RssTree.cpp (modified) (1 diff)

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

@@ -2629 +2629 @@
 {
 
-  if (1) {
-        float param[5];
-        
-        for (int i=0; i < numberOfRays; i++) {
-          mHalton.GetNext(5, param);
-          GenerateRay(param, rays);
-        }
-
-        return rays.size();
-  }
-  
-  vector<RssTreeLeaf *> leaves;
-
-  Debug<<"Collecting leaves..."<<endl<<flush;
-  CollectLeaves(leaves);
-  Debug<<"done."<<endl<<flush;
-  
-  
-  if (numberOfLeaves != leaves.size()) {
-        Debug<<"sorting leaves..."<<endl<<flush;
-        sort(leaves.begin(),
-                 leaves.end(),
-                 GreaterContribution);
-        Debug<<"done."<<endl<<flush;
-  }
-                         
-  
-  Debug<<"Evaluating leaf importance..."<<endl<<flush;
-
-  float sumContrib = 0.0;
-  int i;
-  int k = 0;
-  for (i=0; i < leaves.size() && k < numberOfLeaves; i++)
-        if (ValidLeaf(leaves[i])) {
-          float c = leaves[i]->GetImportance();
-          sumContrib += c;
-          //            cout<<"ray contrib "<<i<<" : "<<c<<endl;
-          k++;
-        }
-
-  Debug<<"done."<<endl<<flush;
-  
-  float avgContrib = sumContrib/numberOfLeaves;
-  
-  // always generate at leat n ray per leaf
-  int fixedPerLeaf = 1;
-  // int fixedPerLeaf = 0;
-  int fixed = fixedPerLeaf*(int)leaves.size();
-
-  // check if the number of fixed is not too big
-
-  if (fixed >= numberOfRays/2) {
-        fixedPerLeaf = 0;
-        fixed = 0;
-  }
-  
-  int iGenerated = numberOfRays - fixed;
-  float ratioPerLeaf = iGenerated /(avgContrib*numberOfLeaves);
-  
-  k = 0;
-
-  Debug<<"generating leaf rays..."<<endl<<flush;
-
-  for (i=0; i < leaves.size() && k < numberOfLeaves; i++)
-        if (ValidLeaf(leaves[i])) {
-          RssTreeLeaf *leaf = leaves[i];
-          float c = leaf->GetImportance();
-          
-          int num = fixedPerLeaf + (int)(c*ratioPerLeaf + 0.5f);
-          GenerateLeafRaysSimple(leaf, num, rays);
-
-          k++;
-        }
-
-  Debug<<"done."<<endl<<flush;
-
-  return (int)rays.size();
+  float param[5];
+  
+  for (int i=0; i < numberOfRays; i++) {
+        mHalton.GetNext(5, param);
+        GenerateRay(param, rays);
+  }
+  
+  return rays.size();
+  
 }