consistency for new position of FPCGPHIK, no dependency to gp-hik-exp anymore

CMakeLists.txt

@@ -5,7 +5,7 @@
 set(the_library "semseg")
 
 #add linkage dependencies to other libraries here
-set("nice_${the_library}_LINKING_DEPENDENCIES" "nice_core" "nice_vislearning" "nice_gp-hik-core" "nice_segmentation" "nice_gp-hik-exp")
+set("nice_${the_library}_LINKING_DEPENDENCIES" "nice_core" "nice_vislearning" "nice_gp-hik-core" "nice_segmentation" )
 
 #####################################################
 message(STATUS "adding library ${the_library}")

semseg/SemSegContextTree.cpp

@@ -56,7 +56,7 @@ SemSegContextTree::SemSegContextTree (const Config *conf, const MultiDataset *md
   
   if(useCategorization && cndir == "")
   {
-    fasthik = new GPHIKClassifierNICE(conf);
+    fasthik = new FPCGPHIK(conf);
   }
   else
   {

semseg/SemSegContextTree.h

@@ -11,11 +11,9 @@
 // nice-core includes
 #include <core/vector/VVector.h>
 
-// nice-gphik-core includes
-#include <gp-hik-exp/GPHIKClassifierNICE.h>
-
 // nice-vislearning includes
 #include <vislearning/features/localfeatures/LocalFeatureColorWeijer.h>
+#include <vislearning/classifier/fpclassifier/gphik/FPCGPHIK.h>
 
 // nice-segmentation includes
 #include <segmentation/RegionSegmentationMethod.h>
@@ -150,7 +148,7 @@ class SemSegContextTree : public SemanticSegmentation
     int rawChannels;
     
     /** classifier for categorization */
-    OBJREC::GPHIKClassifierNICE *fasthik;
+    OBJREC::FPCGPHIK *fasthik;
     
     /** unique numbers for nodes */
     int uniquenumber;

semseg/SemSegContextTree3D.cpp

@@ -118,7 +118,7 @@ SemSegContextTree3D::SemSegContextTree3D (
         this->labelIncrement  = 1;
 
     if ( useCategorization && cndir == "" )
-        this->fasthik = new GPHIKClassifierNICE ( conf );
+        this->fasthik = new FPCGPHIK ( conf );
     else
         this->fasthik = NULL;
 

semseg/SemSegContextTree3D.h

@@ -11,11 +11,9 @@
 // nice-core includes
 #include <core/vector/VVector.h>
 
-// nice-gphik-exp includes
-#include <gp-hik-exp/GPHIKClassifierNICE.h>
-
 // nice-vislearning includes
 #include <vislearning/features/localfeatures/LocalFeatureColorWeijer.h>
+#include <vislearning/classifier/fpclassifier/gphik/FPCGPHIK.h>
 
 // nice-segmentation includes
 #include <segmentation/RegionSegmentationMethod.h>
@@ -146,7 +144,7 @@ private:
   int rawChannels;
 
   /** classifier for categorization */
-  OBJREC::GPHIKClassifierNICE *fasthik;
+  OBJREC::FPCGPHIK *fasthik;
 
   /** unique numbers for nodes */
   int uniquenumber;

semseg/SemSegCsurka.cpp

@@ -118,7 +118,7 @@ SemSegCsurka::SemSegCsurka ( const Config *conf,
   else if ( cname == "SMLR" )
     classifier = new FPCSMLR ( conf, "ClassifierSMLR" );
   else if ( cname == "GPHIK" )
-    classifier = new GPHIKClassifierNICE ( conf, "ClassiferGPHIK" );
+    classifier = new FPCGPHIK ( conf, "ClassiferGPHIK" );
   else
     vclassifier = GenericClassifierSelection::selectVecClassifier ( conf, "main" );
   //classifier = new FPCSparseMultinomialLogisticRegression(conf, "ClassifierSMLR");

semseg/SemSegCsurka.h

@@ -34,15 +34,17 @@
 #include "vislearning/math/cluster/GMM.h"
 #include "vislearning/math/cluster/KMeansOnline.h"
 
-#include "vislearning/classifier/fpclassifier/randomforest/FPCRandomForests.h"
-#include "vislearning/classifier/fpclassifier/logisticregression/FPCSMLR.h"
-#include "gp-hik-exp/GPHIKClassifierNICE.h"
+#include <vislearning/classifier/genericClassifierSelection.h>
+#include <vislearning/classifier/fpclassifier/randomforest/FPCRandomForests.h>
+#include <vislearning/classifier/fpclassifier/gphik/FPCGPHIK.h>
+#include <vislearning/classifier/fpclassifier/logisticregression/FPCSMLR.h>
+
 
 #include "semseg/semseg/postsegmentation/RelativeLocationPrior.h"
 #include "semseg/semseg/postsegmentation/PPSuperregion.h"
 #include "semseg/semseg/postsegmentation/PPGraphCut.h"
 
-#include "vislearning/classifier/genericClassifierSelection.h"
+
 
 /** @brief pixelwise labeling systems */
 

semseg/SemSegNovelty.cpp

@@ -6,7 +6,7 @@
 #include "core/basics/StringTools.h"
 #include "core/basics/Timer.h"
 
-#include "gp-hik-exp/GPHIKClassifierNICE.h"
+#include <vislearning/classifier/fpclassifier/gphik/FPCGPHIK.h>
 #include "vislearning/baselib/ICETools.h"
 #include "vislearning/baselib/Globals.h"
 #include "vislearning/features/fpfeatures/SparseVectorFeature.h"
@@ -218,7 +218,7 @@ void SemSegNovelty::initFromConfig(const Config* conf, const string _confSection
     //this would just take a lot of time, which is not desired so far
     //TODO edit this!
     //this->conf->sB( "GPHIKClassifier", "performOptimizationAfterIncrement", false );    
-    classifier = new GPHIKClassifierNICE ( conf, "GPHIKClassifier" );
+    classifier = new FPCGPHIK ( conf, "GPHIKClassifier" );
   }
   else
     vclassifier = GenericClassifierSelection::selectVecClassifier ( conf, classifierString ); 
@@ -1493,7 +1493,7 @@ void SemSegNovelty::addNewExample(const NICE::Vector& v_newExample, const int &
       Example newExample;
       SparseVector svec ( v_newExample );
       newExample.svec = &svec;
-      static_cast<GPHIKClassifierNICE*>(classifier)->addExample ( newExample, newClassNo );
+      static_cast<FPCGPHIK*>(classifier)->addExample ( newExample, newClassNo );
     } 
   }
   else //vclassifier
@@ -1752,7 +1752,7 @@ void SemSegNovelty::restore ( std::istream & is, int format )
         else
         {
           if ( classifier == NULL )
-            classifier = new OBJREC::GPHIKClassifierNICE();
+            classifier = new OBJREC::FPCGPHIK();
 
           classifier->restore(is, format);              
         }

semseg/SemSegNoveltyBinary.cpp

@@ -8,7 +8,7 @@
 #include <core/basics/StringTools.h>
 #include <core/basics/Timer.h>
 
-#include <gp-hik-exp/GPHIKClassifierNICE.h>
+#include <vislearning/classifier/fpclassifier/gphik/FPCGPHIK.h>
 #include <vislearning/baselib/ICETools.h>
 #include <vislearning/baselib/Globals.h>
 #include <vislearning/features/fpfeatures/SparseVectorFeature.h>
@@ -51,7 +51,7 @@ SemSegNoveltyBinary::SemSegNoveltyBinary ( const Config *conf,
   classifier = NULL;
   vclassifier = NULL;
   if ( classifierString.compare("ClassifierGPHIK") == 0)
-    classifier = new GPHIKClassifierNICE ( &confCopy, "ClassifierGPHIK" );
+    classifier = new FPCGPHIK ( &confCopy, "ClassifierGPHIK" );
   else
     vclassifier = GenericClassifierSelection::selectVecClassifier ( conf, classifierString );