Browse Source

removed unused variables

Sven Sickert 11 years ago
parent
commit
b931d7b15b
2 changed files with 1 additions and 19 deletions
  1. 1 10
      semseg/SemSegContextTree.cpp
  2. 0 9
      semseg/operations/Operations.h

+ 1 - 10
semseg/SemSegContextTree.cpp

@@ -502,14 +502,11 @@ double SemSegContextTree::getBestSplit (
     {
     {
       Features feat;
       Features feat;
       feat.feats = &feats[ ( *it ).first ];
       feat.feats = &feats[ ( *it ).first ];
-      feat.cTree = tree;
-      feat.tree = &forest[tree];
+      feat.rProbs = &regionProbs[ ( *it ).first ];
 
 
       assert ( forest.size() > ( uint ) tree );
       assert ( forest.size() > ( uint ) tree );
       assert ( forest[tree][0].dist.size() > 0 );
       assert ( forest[tree][0].dist.size() > 0 );
 
 
-      feat.rProbs = &regionProbs[ ( *it ).first ];
-
       double val = 0.0;
       double val = 0.0;
       val = featsel[f]->getVal ( feat, ( *it ).second, ( *it ).third, ( *it ).fourth );
       val = featsel[f]->getVal ( feat, ( *it ).second, ( *it ).third, ( *it ).fourth );
       if ( !isfinite ( val ) )
       if ( !isfinite ( val ) )
@@ -1162,8 +1159,6 @@ void SemSegContextTree::train ( const LabeledSet * trainp )
                       // get feature value
                       // get feature value
                       Features feat;
                       Features feat;
                       feat.feats = &allfeats[i];
                       feat.feats = &allfeats[i];
-                      feat.cTree = tree;
-                      feat.tree = &forest[tree];
                       feat.rProbs = &lastRegionProbs[i];
                       feat.rProbs = &lastRegionProbs[i];
                       double val = 0.0;
                       double val = 0.0;
                       val = splitfeat->getVal ( feat, x, y, z );
                       val = splitfeat->getVal ( feat, x, y, z );
@@ -1246,8 +1241,6 @@ void SemSegContextTree::train ( const LabeledSet * trainp )
 
 
 //                        Features feat;
 //                        Features feat;
 //                        feat.feats = &allfeats[i];
 //                        feat.feats = &allfeats[i];
-//                        feat.cTree = tree;
-//                        feat.tree = &forest[tree];
 //                        feat.rProbs = &lastRegionProbs[i];
 //                        feat.rProbs = &lastRegionProbs[i];
 
 
 //                        double val = splitfeat->getVal ( feat, x, y, z );
 //                        double val = splitfeat->getVal ( feat, x, y, z );
@@ -1754,8 +1747,6 @@ void SemSegContextTree::classify (
               noNewSplit = false;
               noNewSplit = false;
               Features feat;
               Features feat;
               feat.feats = &imgData;
               feat.feats = &imgData;
-              feat.cTree = tree;
-              feat.tree = &forest[tree];
               feat.rProbs = &lastRegionProbs;
               feat.rProbs = &lastRegionProbs;
 
 
               double val = forest[tree][node].feat->getVal ( feat, x, y, z );
               double val = forest[tree][node].feat->getVal ( feat, x, y, z );

+ 0 - 9
semseg/operations/Operations.h

@@ -137,15 +137,6 @@ struct Features {
   /** simple features like RGB values */
   /** simple features like RGB values */
   NICE::MultiChannelImage3DT<double> *feats;
   NICE::MultiChannelImage3DT<double> *feats;
 
 
-  /** node index for each pixel (width,height,depth) in each tree (channel) */
-  //NICE::MultiChannelImage3DT<unsigned short int> *nIndices;
-
-  /** current tree index */
-  int cTree;
-
-  /** current tree (all nodes) */
-  std::vector<TreeNode> *tree;
-  
   /** probabilities for each region */
   /** probabilities for each region */
   std::vector<std::vector<double> > *rProbs;
   std::vector<std::vector<double> > *rProbs;
 };
 };