faster

semseg/SemSegContextTree.cpp

@@ -1825,9 +1825,9 @@ void SemSegContextTree::train ( const MultiDataset *md )
 
 void SemSegContextTree::semanticseg ( CachedExample *ce, NICE::Image & segresult, NICE::MultiChannelImageT<double> & probabilities )
 {
-  int xpos = 8;
+  //int xpos = 8;
   //int xpos = 15;
-  int ypos = 78;
+  //int ypos = 78;
 
   int xsize;
   int ysize;
@@ -1862,7 +1862,6 @@ void SemSegContextTree::semanticseg ( CachedExample *ce, NICE::Image & segresult
 
 #ifdef LOCALFEATS
   lfcw->getFeats ( img, feats );
-
 #else
   feats.reInit ( xsize, ysize, 3, true );
 
@@ -1894,13 +1893,15 @@ void SemSegContextTree::semanticseg ( CachedExample *ce, NICE::Image & segresult
   {
     depth++;
     
+#ifdef TEXTONMAP
     double weight = computeWeight(depth,maxDepth) - computeWeight(depth-1,maxDepth);
     
     if(depth == 1)
     {
       weight = computeWeight(1,maxDepth);
     }
-    
+#endif
+
     allleaf = true;
     
     MultiChannelImageT<unsigned short int> lastfeats = currentfeats;
@@ -1931,18 +1932,19 @@ void SemSegContextTree::semanticseg ( CachedExample *ce, NICE::Image & segresult
             if ( val < forest[tree][t].decision )
             {
               currentfeats.set ( x, y, forest[tree][t].left, tree );
+#ifdef TEXTONMAP
               SparseVectorInt v;
               v.insert ( pair<int, double> ( forest[tree][forest[tree][t].left].nodeNumber, weight ) );
-#ifdef TEXTONMAP
               textonMap ( subx, suby ).add ( v );
 #endif
             }
             else
             {
               currentfeats.set ( x, y, forest[tree][t].right, tree );
+#ifdef TEXTONMAP
               SparseVectorInt v;
               v.insert ( pair<int, double> ( forest[tree][forest[tree][t].right].nodeNumber, weight ) );
-#ifdef TEXTONMAP
+
               textonMap ( subx, suby ).add ( v );
 #endif
             }
@@ -1983,16 +1985,18 @@ void SemSegContextTree::semanticseg ( CachedExample *ce, NICE::Image & segresult
   integralTexton(integralTexton.width()-1, integralTexton.height()-1).store(outstream);
   outstream.close();
 #endif
-  
-  string cndir = conf->gS ( "SSContextTree", "cndir", "" );
-  int classes = ( int ) probabilities.numChannels;
+
   vector<int> useclass ( classes, 1 );
 
+  string cndir = conf->gS ( "SSContextTree", "cndir", "" );
+#ifdef WRITEGLOB
+  int classes = ( int ) probabilities.numChannels;
+  
   std::vector< std::string > list;
   StringTools::split ( currentFile, '/', list );
 
   string orgname = list.back();
-#ifdef WRITEGLOB
+
   ofstream ostream("filelist.txt",ofstream::app);
   ostream << orgname << ".dat" << endl;
   ostream.close();