fixed includes and added bare member function 'classify'

progs/testSemanticSegmentation3D.cpp

@@ -16,7 +16,7 @@
 #include <vislearning/baselib/ICETools.h>
 
 #include <core/image/MultiChannelImage3DT.h>
-#include <semseg3d/semseg/SemSegContextTree3D.h>
+#include <semseg/semseg/SemSegContextTree3D.h>
 
 #include <core/basics/ResourceStatistics.h>
 #include <core/image/Morph.h>

semseg/SemSegContextTree.h

@@ -176,6 +176,11 @@ class SemSegContextTree : public SemanticSegmentation
      */
     void train ( const MultiDataset *md );
 
+    void classify ( NICE::MultiChannelImage3DT<double> & imgData,
+                    NICE::MultiChannelImageT<double> & segresult,
+                    NICE::MultiChannelImage3DT<double> & probabilities,
+                    const std::vector<std::string> & filelist )
+    {}
 
     /**
      * @brief computes integral image of given feats

semseg/SemSegContextTree3D.cpp

@@ -1,26 +1,25 @@
 #include "SemSegContextTree3D.h"
-#include "vislearning/baselib/Globals.h"
-#include "core/basics/StringTools.h"
 
+#include "core/basics/FileName.h"
+#include "core/basics/numerictools.h"
+#include "core/basics/quadruplet.h"
+#include "core/basics/StringTools.h"
+#include "core/basics/Timer.h"
+#include "core/basics/vectorio.h"
+#include "core/image/Filter.h"
+#include "core/image/FilterT.h"
+#include "core/image/Morph.h"
 #include "core/imagedisplay/ImageDisplay.h"
 
+#include "vislearning/baselib/cc.h"
+#include "vislearning/baselib/Globals.h"
+#include "vislearning/baselib/ICETools.h"
 #include "vislearning/cbaselib/CachedExample.h"
 #include "vislearning/cbaselib/PascalResults.h"
-#include "vislearning/baselib/cc.h"
-#include "segmentation/RSMeanShift.h"
+
 #include "segmentation/RSGraphBased.h"
+#include "segmentation/RSMeanShift.h"
 #include "segmentation/RSSlic.h"
-#include "core/basics/numerictools.h"
-#include "core/basics/StringTools.h"
-#include "core/basics/FileName.h"
-#include "vislearning/baselib/ICETools.h"
-
-#include "core/basics/Timer.h"
-#include "core/basics/vectorio.h"
-#include "core/basics/quadruplet.h"
-#include <core/image/Filter.h>
-#include "core/image/FilterT.h"
-#include <core/image/Morph.h>
 
 #include <omp.h>
 #include <iostream>
@@ -2270,10 +2269,3 @@ void SemSegContextTree3D::restore ( std::istream & is, int format )
 
   is >> uniquenumber;
 }
-
-//###################### DEPRECATED #########################//
-
-void SemSegContextTree3D::semanticseg ( OBJREC::CachedExample *ce,
-                               NICE::Image & segresult,
-                               NICE::MultiChannelImageT<double> & probabilities )
-{}

semseg/SemSegContextTree3D.h

@@ -10,7 +10,6 @@
 
 // nice-core includes
 #include <core/vector/VVector.h>
-#include <core/image/MultiChannelImage3DT.h>
 
 // nice-gphik-exp includes
 #include <gp-hik-exp/GPHIKClassifierNICE.h>
@@ -23,7 +22,7 @@
 
 // nice-semseg includes
 #include "SemanticSegmentation.h"
-#include "semseg3d/semseg/operations/Operations3D.h"
+#include "semseg/semseg/operations/Operations3D.h"
 
 namespace OBJREC
 {
@@ -246,7 +245,8 @@ public:
   // deprecated stuff
   virtual void semanticseg ( OBJREC::CachedExample *ce,
                              NICE::Image & segresult,
-                             NICE::MultiChannelImageT<double> & probabilities );
+                             NICE::MultiChannelImageT<double> & probabilities )
+  {}
 
   bool active3DMode ()
   {

semseg/SemSegCsurka.h

@@ -233,6 +233,12 @@ class SemSegCsurka : public SemanticSegmentation
                        NICE::Image & segresult,
                        NICE::MultiChannelImageT<double> & probabilities );
 
+    void classify ( NICE::MultiChannelImage3DT<double> & imgData,
+                    NICE::MultiChannelImageT<double> & segresult,
+                    NICE::MultiChannelImage3DT<double> & probabilities,
+                    const std::vector<std::string> & filelist )
+    {}
+
     /** this procedure is equal semanticseg, if there is no post process
     * @param ce image data
     * @param segresult result of the semantic segmentation with a label for each pixel

semseg/SemSegNovelty.h

@@ -245,6 +245,12 @@ class SemSegNovelty : public SemanticSegmentation
                        NICE::Image & segresult,
                        NICE::MultiChannelImageT<double> & probabilities );
     
+    void classify ( NICE::MultiChannelImage3DT<double> & imgData,
+                    NICE::MultiChannelImageT<double> & segresult,
+                    NICE::MultiChannelImage3DT<double> & probabilities,
+                    const std::vector<std::string> & filelist )
+    {}
+
     /**
      * @brief visualize a specific region in the original image
      *

semseg/SemSegNoveltyBinary.h

@@ -197,6 +197,11 @@ class SemSegNoveltyBinary : public SemanticSegmentation
                        NICE::Image & segresult,
                        NICE::MultiChannelImageT<double> & probabilities );
     
+    void classify ( NICE::MultiChannelImage3DT<double> & imgData,
+                    NICE::MultiChannelImageT<double> & segresult,
+                    NICE::MultiChannelImage3DT<double> & probabilities,
+                    const std::vector<std::string> & filelist )
+    {}
     
     /**
      * @brief visualize a specific region in the original image