bugfixes

classifier/FPCnone.cpp

@@ -1,4 +1,4 @@
-#include "objrec-froehlichexp/classifier/FPCnone.h"
+#include "semseg/classifier/FPCnone.h"
 
 #include <iostream>
 

progs/testSemanticSegmentation.cpp

@@ -15,14 +15,14 @@
 #include "core/basics/StringTools.h"
 #include <vislearning/baselib/ICETools.h>
 
-#include <objrec-froehlichexp/semseg/SemanticSegmentation.h>
-#include <objrec-froehlichexp/semseg/SemSegLocal.h>
-#include <objrec-froehlichexp/semseg/SemSegCsurka.h>
-#include <objrec-froehlichexp/semseg/SemSegNovelty.h>
-#include <objrec-froehlichexp/semseg/SemSegRegionBased.h>
-#include <objrec-froehlichexp/semseg/SemSegContextTree.h>
-
-#include <fast-hik/ResourceStatistics.h>
+#include <semseg/semseg/SemanticSegmentation.h>
+#include <semseg/semseg/SemSegLocal.h>
+#include <semseg/semseg/SemSegCsurka.h>
+#include <semseg/semseg/SemSegNovelty.h>
+#include <semseg/semseg/SemSegRegionBased.h>
+#include <semseg/semseg/SemSegContextTree.h>
+
+#include <core/basics/ResourceStatistics.h>
 
 #include <fstream>
 

semseg/SemSegContextTree.cpp

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

semseg/SemSegContextTree.h

@@ -13,9 +13,9 @@
 #include "vislearning/features/localfeatures/LFColorWeijer.h"
 #include "objrec/segmentation/RegionSegmentationMethod.h"
 
-#include "objrec-froehlichexp/semseg/operations/Operations.h"
+#include "semseg/semseg/operations/Operations.h"
 
-#include "fast-hik/GPHIKClassifier.h"
+#include "gp-hik-exp/GPHIKClassifierNICE.h"
 
 namespace OBJREC {
 
@@ -140,7 +140,7 @@ class SemSegContextTree : public SemanticSegmentation, public NICE::Persistent
     int rawChannels;
     
     /** classifier for categorization */
-    OBJREC::GPHIKClassifier *fasthik;
+    OBJREC::GPHIKClassifierNICE *fasthik;
     
     /** unique numbers for nodes */
     int uniquenumber;

semseg/SemSegCsurka.cpp

@@ -4,7 +4,7 @@
 #include "SemSegCsurka.h"
 #include "vislearning/baselib/ICETools.h"
 #include "core/image/Filter.h"
-#include "objrec-froehlichexp/semseg/postsegmentation/PSSImageLevelPrior.h"
+#include "semseg/semseg/postsegmentation/PSSImageLevelPrior.h"
 
 using namespace std;
 using namespace NICE;
@@ -116,7 +116,7 @@ SemSegCsurka::SemSegCsurka ( const Config *conf,
   else if ( cname == "SMLR" )
     classifier = new FPCSMLR ( conf, "ClassifierSMLR" );
   else if ( cname == "GPHIK" )
-    classifier = new GPHIKClassifier ( conf, "ClassiferGPHIK" );
+    classifier = new GPHIKClassifierNICE ( conf, "ClassiferGPHIK" );
   else
     vclassifier = CSGeneric::selectVecClassifier ( conf, "main" );
   //classifier = new FPCSparseMultinomialLogisticRegression(conf, "ClassifierSMLR");

semseg/SemSegCsurka.h

@@ -36,11 +36,11 @@
 
 #include "vislearning/classifier/fpclassifier/randomforest/FPCRandomForests.h"
 #include "vislearning/classifier/fpclassifier/logisticregression/FPCSMLR.h"
-#include "fast-hik/GPHIKClassifier.h"
+#include "gp-hik-exp/GPHIKClassifierNICE.h"
 
-#include "objrec-froehlichexp/semseg/postsegmentation/RelativeLocationPrior.h"
-#include "objrec-froehlichexp/semseg/postsegmentation/PPSuperregion.h"
-#include "objrec-froehlichexp/semseg/postsegmentation/PPGraphCut.h"
+#include "semseg/semseg/postsegmentation/RelativeLocationPrior.h"
+#include "semseg/semseg/postsegmentation/PPSuperregion.h"
+#include "semseg/semseg/postsegmentation/PPGraphCut.h"
 
 
 #include <objrec/iclassifier/icgeneric/CSGeneric.h>

semseg/SemSegNovelty.cpp

@@ -4,7 +4,7 @@
 #include "SemSegNovelty.h"
 
 #include "core/image/FilterT.h"
-#include "fast-hik/GPHIKClassifier.h"
+#include "gp-hik-exp/GPHIKClassifierNICE.h"
 #include "vislearning/baselib/ICETools.h"
 #include "vislearning/baselib/Globals.h"
 #include "vislearning/features/fpfeatures/SparseVectorFeature.h"
@@ -31,7 +31,7 @@ SemSegNovelty::SemSegNovelty ( const Config *conf,
   cache = conf->gS ( "cache", "root", "" );
 
 
-  classifier = new GPHIKClassifier ( conf, "ClassiferGPHIK" );;
+  classifier = new GPHIKClassifierNICE ( conf, "ClassiferGPHIK" );;
 
   whs = conf->gI ( section, "window_size", 10 );
   featdist = conf->gI ( section, "grid", 10 );

semseg/SemSegRegionBased.h

@@ -20,7 +20,7 @@
 
 #include "vislearning/math/ftransform/PCA.h"
 
-#include "objrec-froehlichexp/semseg/postsegmentation/PPGraphCut.h"
+#include "semseg/semseg/postsegmentation/PPGraphCut.h"
 
 namespace OBJREC
 {

semseg/libdepend.inc

@@ -4,5 +4,5 @@ $(call PKG_DEPEND_INT,objrec/segmentation)
 $(call PKG_DEPEND_INT,objrec/fourier)
 $(call PKG_DEPEND_INT,objrec/features)
 $(call PKG_DEPEND_INT,objrec/semanticsegmentation)
-$(call PKG_DEPEND_INT,fast-hik)
-#$(call PKG_DEPEND_INT,objrec-froehlichexp/classifier)
+$(call PKG_DEPEND_INT,gp-hik-exp)
+#$(call PKG_DEPEND_INT,semseg/classifier)