deICE

semseg/SemSegContextTree.cpp

@@ -109,7 +109,7 @@ SemSegContextTree::SemSegContextTree( const Config *conf, const MultiDataset *md
 	
 	featsPerSplit = conf->gI(section, "feats_per_split", 200);
 	
-	useShannonEntropy = conf->gB(section, "use_shannon_entropy", false);
+	useShannonEntropy = conf->gB(section, "use_shannon_entropy", true);
 	
 	ops.push_back(new Minus());
 	ops.push_back(new MinusAbs());

semseg/SemSegCsurka.cpp

@@ -104,10 +104,14 @@ SemSegCsurka::SemSegCsurka ( const Config *conf,
 	else
 		relloc = NULL;
 
+#ifdef NICE_USELIB_ICE
 	if ( usesrg )
 		srg = new PPSuperregion ( conf );
 	else
 		srg = NULL;
+#else
+	srg = NULL;
+#endif
 
 	if ( usegcopt )
 		gcopt = new PPGraphCut ( conf );
@@ -1745,7 +1749,6 @@ getchar();*/
 				segresult.setPixel(x,y,Regionen[pos].first);
 			}
 		}
-
 #define WRITEREGIONS
 #ifdef WRITEREGIONS
 		RegionGraph rg;

semseg/SemSegCsurka.h

@@ -41,7 +41,9 @@
 
 #include "objrec-froehlichexp/semseg/postsegmentation/PSSImageLevelPrior.h"
 #include "objrec-froehlichexp/semseg/postsegmentation/RelativeLocationPrior.h"
-#include "objrec-froehlichexp/semseg/postsegmentation/PPSuperregion.h"
+#ifdef NICE_USELIB_ICE
+ #include "objrec-froehlichexp/semseg/postsegmentation/PPSuperregion.h"
+#endif
 #include "objrec-froehlichexp/semseg/postsegmentation/PPGraphCut.h"
 
 
@@ -148,8 +150,12 @@ class SemSegCsurka : public SemanticSegmentation
 	//! the relative location features
 	RelativeLocationPrior *relloc;
 	
+#ifdef NICE_USELIB_ICE
 	//! Shape pp
 	PPSuperregion *srg;
+#else
+	int *srg;
+#endif
 	
 	//! Graph Cut pp
 	PPGraphCut *gcopt;

semseg/postsegmentation/PPGraphCut.cpp

@@ -1,4 +1,3 @@
-
 #include "PPGraphCut.h"
 
 #include "objrec/segmentation/RegionGraph.h"

semseg/postsegmentation/PPSuperregion.cpp

@@ -1,5 +1,7 @@
 #include "PPSuperregion.h"
 
+#ifdef NICE_USELIB_ICE
+
 #include <core/iceconversion/convertice.h>
 
 #include "objrec/segmentation/RegionGraph.h"
@@ -273,3 +275,5 @@ void PPSuperregion::clear()
 {
 	
 }
+
+#endif

semseg/postsegmentation/PPSuperregion.h

@@ -5,6 +5,9 @@
  * @date 08/19/2009
 
  */
+
+#ifdef NICE_USELIB_ICE
+
 #ifndef PPSUPERREGIONINCLUDE
 #define PPSUPERREGIONINCLUDE
 
@@ -115,3 +118,5 @@ class PPSuperregion : public Persistent
 } //namespace
 
 #endif
+
+#endif