소스 검색

diverse changes

Sven Sickert 11 년 전
부모
커밋
a8c8418a8b
4개의 변경된 파일711개의 추가작업 그리고 15개의 파일을 삭제
  1. 690 5
      Makefile
  2. 17 10
      semseg/SemSegContextTree.cpp
  3. 3 0
      semseg/SemSegContextTree.h
  4. 1 0
      semseg/operations/Operations.cpp

+ 690 - 5
Makefile

@@ -1,8 +1,693 @@
-#TARGETS_FROM:=$(notdir $(patsubst %/,%,$(shell pwd)))/$(TARGETS_FROM)
-#$(info recursivly going up: $(TARGETS_FROM) ($(shell pwd)))
+# CMAKE generated file: DO NOT EDIT!
+# Generated by "Unix Makefiles" Generator, CMake Version 2.8
 
-all:
+# Default target executed when no arguments are given to make.
+default_target: all
+.PHONY : default_target
 
-%:
-	$(MAKE) TARGETS_FROM=$(notdir $(patsubst %/,%,$(shell pwd)))/$(TARGETS_FROM) -C .. $@
+#=============================================================================
+# Special targets provided by cmake.
+
+# Disable implicit rules so canonical targets will work.
+.SUFFIXES:
+
+# Remove some rules from gmake that .SUFFIXES does not remove.
+SUFFIXES =
+
+.SUFFIXES: .hpux_make_needs_suffix_list
+
+# Suppress display of executed commands.
+$(VERBOSE).SILENT:
+
+# A target that is always out of date.
+cmake_force:
+.PHONY : cmake_force
+
+#=============================================================================
+# Set environment variables for the build.
+
+# The shell in which to execute make rules.
+SHELL = /bin/sh
+
+# The CMake executable.
+CMAKE_COMMAND = /home/ruehle/progs/cmake-2.8.12.1-Linux-i386/bin/cmake
+
+# The command to remove a file.
+RM = /home/ruehle/progs/cmake-2.8.12.1-Linux-i386/bin/cmake -E remove -f
+
+# Escaping for special characters.
+EQUALS = =
+
+# The program to use to edit the cache.
+CMAKE_EDIT_COMMAND = /home/ruehle/progs/cmake-2.8.12.1-Linux-i386/bin/ccmake
+
+# The top-level source directory on which CMake was run.
+CMAKE_SOURCE_DIR = /home/sickert/src/nice-gl
+
+# The top-level build directory on which CMake was run.
+CMAKE_BINARY_DIR = /home/sickert/src/nice-gl
+
+#=============================================================================
+# Targets provided globally by CMake.
+
+# Special rule for the target edit_cache
+edit_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake cache editor..."
+	/home/ruehle/progs/cmake-2.8.12.1-Linux-i386/bin/ccmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : edit_cache
+
+# Special rule for the target edit_cache
+edit_cache/fast: edit_cache
+.PHONY : edit_cache/fast
+
+# Special rule for the target install
+install: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+	/home/ruehle/progs/cmake-2.8.12.1-Linux-i386/bin/cmake -P cmake_install.cmake
+.PHONY : install
+
+# Special rule for the target install
+install/fast: preinstall/fast
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
+	/home/ruehle/progs/cmake-2.8.12.1-Linux-i386/bin/cmake -P cmake_install.cmake
+.PHONY : install/fast
+
+# Special rule for the target install/local
+install/local: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
+	/home/ruehle/progs/cmake-2.8.12.1-Linux-i386/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
+.PHONY : install/local
+
+# Special rule for the target install/local
+install/local/fast: install/local
+.PHONY : install/local/fast
+
+# Special rule for the target install/strip
+install/strip: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
+	/home/ruehle/progs/cmake-2.8.12.1-Linux-i386/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
+.PHONY : install/strip
+
+# Special rule for the target install/strip
+install/strip/fast: install/strip
+.PHONY : install/strip/fast
+
+# Special rule for the target list_install_components
+list_install_components:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\" \"main\""
+.PHONY : list_install_components
+
+# Special rule for the target list_install_components
+list_install_components/fast: list_install_components
+.PHONY : list_install_components/fast
+
+# Special rule for the target package
+package: preinstall
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool..."
+	cd /home/sickert/src/nice-gl && /home/ruehle/progs/cmake-2.8.12.1-Linux-i386/bin/cpack --config ./CPackConfig.cmake
+.PHONY : package
+
+# Special rule for the target package
+package/fast: package
+.PHONY : package/fast
+
+# Special rule for the target package_source
+package_source:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Run CPack packaging tool for source..."
+	cd /home/sickert/src/nice-gl && /home/ruehle/progs/cmake-2.8.12.1-Linux-i386/bin/cpack --config ./CPackSourceConfig.cmake /home/sickert/src/nice-gl/CPackSourceConfig.cmake
+.PHONY : package_source
+
+# Special rule for the target package_source
+package_source/fast: package_source
+.PHONY : package_source/fast
+
+# Special rule for the target rebuild_cache
+rebuild_cache:
+	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
+	/home/ruehle/progs/cmake-2.8.12.1-Linux-i386/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
+.PHONY : rebuild_cache
+
+# Special rule for the target rebuild_cache
+rebuild_cache/fast: rebuild_cache
+.PHONY : rebuild_cache/fast
+
+# The main all target
+all: cmake_check_build_system
+	cd /home/sickert/src/nice-gl && $(CMAKE_COMMAND) -E cmake_progress_start /home/sickert/src/nice-gl/CMakeFiles /home/sickert/src/nice-gl/semseg3d/CMakeFiles/progress.marks
+	cd /home/sickert/src/nice-gl && $(MAKE) -f CMakeFiles/Makefile2 semseg3d/all
+	$(CMAKE_COMMAND) -E cmake_progress_start /home/sickert/src/nice-gl/CMakeFiles 0
+.PHONY : all
+
+# The main clean target
+clean:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f CMakeFiles/Makefile2 semseg3d/clean
+.PHONY : clean
+
+# The main clean target
+clean/fast: clean
+.PHONY : clean/fast
+
+# Prepare targets for installation.
+preinstall: all
+	cd /home/sickert/src/nice-gl && $(MAKE) -f CMakeFiles/Makefile2 semseg3d/preinstall
+.PHONY : preinstall
+
+# Prepare targets for installation.
+preinstall/fast:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f CMakeFiles/Makefile2 semseg3d/preinstall
+.PHONY : preinstall/fast
+
+# clear depends
+depend:
+	cd /home/sickert/src/nice-gl && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
+.PHONY : depend
+
+# Convenience name for target.
+semseg3d/CMakeFiles/nice_semseg3d.dir/rule:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f CMakeFiles/Makefile2 semseg3d/CMakeFiles/nice_semseg3d.dir/rule
+.PHONY : semseg3d/CMakeFiles/nice_semseg3d.dir/rule
+
+# Convenience name for target.
+nice_semseg3d: semseg3d/CMakeFiles/nice_semseg3d.dir/rule
+.PHONY : nice_semseg3d
+
+# fast build rule for target.
+nice_semseg3d/fast:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/nice_semseg3d.dir/build.make semseg3d/CMakeFiles/nice_semseg3d.dir/build
+.PHONY : nice_semseg3d/fast
+
+# Convenience name for target.
+semseg3d/CMakeFiles/nice_semseg3d_automoc.dir/rule:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f CMakeFiles/Makefile2 semseg3d/CMakeFiles/nice_semseg3d_automoc.dir/rule
+.PHONY : semseg3d/CMakeFiles/nice_semseg3d_automoc.dir/rule
+
+# Convenience name for target.
+nice_semseg3d_automoc: semseg3d/CMakeFiles/nice_semseg3d_automoc.dir/rule
+.PHONY : nice_semseg3d_automoc
+
+# fast build rule for target.
+nice_semseg3d_automoc/fast:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/nice_semseg3d_automoc.dir/build.make semseg3d/CMakeFiles/nice_semseg3d_automoc.dir/build
+.PHONY : nice_semseg3d_automoc/fast
+
+# Convenience name for target.
+semseg3d/CMakeFiles/semseg3d_makeLabeledImage.dir/rule:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f CMakeFiles/Makefile2 semseg3d/CMakeFiles/semseg3d_makeLabeledImage.dir/rule
+.PHONY : semseg3d/CMakeFiles/semseg3d_makeLabeledImage.dir/rule
+
+# Convenience name for target.
+semseg3d_makeLabeledImage: semseg3d/CMakeFiles/semseg3d_makeLabeledImage.dir/rule
+.PHONY : semseg3d_makeLabeledImage
+
+# fast build rule for target.
+semseg3d_makeLabeledImage/fast:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_makeLabeledImage.dir/build.make semseg3d/CMakeFiles/semseg3d_makeLabeledImage.dir/build
+.PHONY : semseg3d_makeLabeledImage/fast
+
+# Convenience name for target.
+semseg3d/CMakeFiles/semseg3d_makeLabeledImage_automoc.dir/rule:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f CMakeFiles/Makefile2 semseg3d/CMakeFiles/semseg3d_makeLabeledImage_automoc.dir/rule
+.PHONY : semseg3d/CMakeFiles/semseg3d_makeLabeledImage_automoc.dir/rule
+
+# Convenience name for target.
+semseg3d_makeLabeledImage_automoc: semseg3d/CMakeFiles/semseg3d_makeLabeledImage_automoc.dir/rule
+.PHONY : semseg3d_makeLabeledImage_automoc
+
+# fast build rule for target.
+semseg3d_makeLabeledImage_automoc/fast:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_makeLabeledImage_automoc.dir/build.make semseg3d/CMakeFiles/semseg3d_makeLabeledImage_automoc.dir/build
+.PHONY : semseg3d_makeLabeledImage_automoc/fast
+
+# Convenience name for target.
+semseg3d/CMakeFiles/semseg3d_testLBPComputation.dir/rule:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f CMakeFiles/Makefile2 semseg3d/CMakeFiles/semseg3d_testLBPComputation.dir/rule
+.PHONY : semseg3d/CMakeFiles/semseg3d_testLBPComputation.dir/rule
+
+# Convenience name for target.
+semseg3d_testLBPComputation: semseg3d/CMakeFiles/semseg3d_testLBPComputation.dir/rule
+.PHONY : semseg3d_testLBPComputation
+
+# fast build rule for target.
+semseg3d_testLBPComputation/fast:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testLBPComputation.dir/build.make semseg3d/CMakeFiles/semseg3d_testLBPComputation.dir/build
+.PHONY : semseg3d_testLBPComputation/fast
+
+# Convenience name for target.
+semseg3d/CMakeFiles/semseg3d_testLBPComputation_automoc.dir/rule:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f CMakeFiles/Makefile2 semseg3d/CMakeFiles/semseg3d_testLBPComputation_automoc.dir/rule
+.PHONY : semseg3d/CMakeFiles/semseg3d_testLBPComputation_automoc.dir/rule
+
+# Convenience name for target.
+semseg3d_testLBPComputation_automoc: semseg3d/CMakeFiles/semseg3d_testLBPComputation_automoc.dir/rule
+.PHONY : semseg3d_testLBPComputation_automoc
+
+# fast build rule for target.
+semseg3d_testLBPComputation_automoc/fast:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testLBPComputation_automoc.dir/build.make semseg3d/CMakeFiles/semseg3d_testLBPComputation_automoc.dir/build
+.PHONY : semseg3d_testLBPComputation_automoc/fast
+
+# Convenience name for target.
+semseg3d/CMakeFiles/semseg3d_testRayFeatComputation.dir/rule:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f CMakeFiles/Makefile2 semseg3d/CMakeFiles/semseg3d_testRayFeatComputation.dir/rule
+.PHONY : semseg3d/CMakeFiles/semseg3d_testRayFeatComputation.dir/rule
+
+# Convenience name for target.
+semseg3d_testRayFeatComputation: semseg3d/CMakeFiles/semseg3d_testRayFeatComputation.dir/rule
+.PHONY : semseg3d_testRayFeatComputation
+
+# fast build rule for target.
+semseg3d_testRayFeatComputation/fast:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testRayFeatComputation.dir/build.make semseg3d/CMakeFiles/semseg3d_testRayFeatComputation.dir/build
+.PHONY : semseg3d_testRayFeatComputation/fast
+
+# Convenience name for target.
+semseg3d/CMakeFiles/semseg3d_testRayFeatComputation_automoc.dir/rule:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f CMakeFiles/Makefile2 semseg3d/CMakeFiles/semseg3d_testRayFeatComputation_automoc.dir/rule
+.PHONY : semseg3d/CMakeFiles/semseg3d_testRayFeatComputation_automoc.dir/rule
+
+# Convenience name for target.
+semseg3d_testRayFeatComputation_automoc: semseg3d/CMakeFiles/semseg3d_testRayFeatComputation_automoc.dir/rule
+.PHONY : semseg3d_testRayFeatComputation_automoc
+
+# fast build rule for target.
+semseg3d_testRayFeatComputation_automoc/fast:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testRayFeatComputation_automoc.dir/build.make semseg3d/CMakeFiles/semseg3d_testRayFeatComputation_automoc.dir/build
+.PHONY : semseg3d_testRayFeatComputation_automoc/fast
+
+# Convenience name for target.
+semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation.dir/rule:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f CMakeFiles/Makefile2 semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation.dir/rule
+.PHONY : semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation.dir/rule
+
+# Convenience name for target.
+semseg3d_testSemanticSegmentation: semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation.dir/rule
+.PHONY : semseg3d_testSemanticSegmentation
+
+# fast build rule for target.
+semseg3d_testSemanticSegmentation/fast:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation.dir/build.make semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation.dir/build
+.PHONY : semseg3d_testSemanticSegmentation/fast
+
+# Convenience name for target.
+semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation_automoc.dir/rule:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f CMakeFiles/Makefile2 semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation_automoc.dir/rule
+.PHONY : semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation_automoc.dir/rule
+
+# Convenience name for target.
+semseg3d_testSemanticSegmentation_automoc: semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation_automoc.dir/rule
+.PHONY : semseg3d_testSemanticSegmentation_automoc
+
+# fast build rule for target.
+semseg3d_testSemanticSegmentation_automoc/fast:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation_automoc.dir/build.make semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation_automoc.dir/build
+.PHONY : semseg3d_testSemanticSegmentation_automoc/fast
+
+nice_semseg3d_automoc.o: nice_semseg3d_automoc.cpp.o
+.PHONY : nice_semseg3d_automoc.o
+
+# target to build an object file
+nice_semseg3d_automoc.cpp.o:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/nice_semseg3d.dir/build.make semseg3d/CMakeFiles/nice_semseg3d.dir/nice_semseg3d_automoc.cpp.o
+.PHONY : nice_semseg3d_automoc.cpp.o
+
+nice_semseg3d_automoc.i: nice_semseg3d_automoc.cpp.i
+.PHONY : nice_semseg3d_automoc.i
+
+# target to preprocess a source file
+nice_semseg3d_automoc.cpp.i:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/nice_semseg3d.dir/build.make semseg3d/CMakeFiles/nice_semseg3d.dir/nice_semseg3d_automoc.cpp.i
+.PHONY : nice_semseg3d_automoc.cpp.i
+
+nice_semseg3d_automoc.s: nice_semseg3d_automoc.cpp.s
+.PHONY : nice_semseg3d_automoc.s
+
+# target to generate assembly for a file
+nice_semseg3d_automoc.cpp.s:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/nice_semseg3d.dir/build.make semseg3d/CMakeFiles/nice_semseg3d.dir/nice_semseg3d_automoc.cpp.s
+.PHONY : nice_semseg3d_automoc.cpp.s
+
+progs/makeLabeledImage.o: progs/makeLabeledImage.cpp.o
+.PHONY : progs/makeLabeledImage.o
+
+# target to build an object file
+progs/makeLabeledImage.cpp.o:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_makeLabeledImage.dir/build.make semseg3d/CMakeFiles/semseg3d_makeLabeledImage.dir/progs/makeLabeledImage.cpp.o
+.PHONY : progs/makeLabeledImage.cpp.o
+
+progs/makeLabeledImage.i: progs/makeLabeledImage.cpp.i
+.PHONY : progs/makeLabeledImage.i
+
+# target to preprocess a source file
+progs/makeLabeledImage.cpp.i:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_makeLabeledImage.dir/build.make semseg3d/CMakeFiles/semseg3d_makeLabeledImage.dir/progs/makeLabeledImage.cpp.i
+.PHONY : progs/makeLabeledImage.cpp.i
+
+progs/makeLabeledImage.s: progs/makeLabeledImage.cpp.s
+.PHONY : progs/makeLabeledImage.s
+
+# target to generate assembly for a file
+progs/makeLabeledImage.cpp.s:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_makeLabeledImage.dir/build.make semseg3d/CMakeFiles/semseg3d_makeLabeledImage.dir/progs/makeLabeledImage.cpp.s
+.PHONY : progs/makeLabeledImage.cpp.s
+
+progs/testLBPComputation.o: progs/testLBPComputation.cpp.o
+.PHONY : progs/testLBPComputation.o
+
+# target to build an object file
+progs/testLBPComputation.cpp.o:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testLBPComputation.dir/build.make semseg3d/CMakeFiles/semseg3d_testLBPComputation.dir/progs/testLBPComputation.cpp.o
+.PHONY : progs/testLBPComputation.cpp.o
+
+progs/testLBPComputation.i: progs/testLBPComputation.cpp.i
+.PHONY : progs/testLBPComputation.i
+
+# target to preprocess a source file
+progs/testLBPComputation.cpp.i:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testLBPComputation.dir/build.make semseg3d/CMakeFiles/semseg3d_testLBPComputation.dir/progs/testLBPComputation.cpp.i
+.PHONY : progs/testLBPComputation.cpp.i
+
+progs/testLBPComputation.s: progs/testLBPComputation.cpp.s
+.PHONY : progs/testLBPComputation.s
+
+# target to generate assembly for a file
+progs/testLBPComputation.cpp.s:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testLBPComputation.dir/build.make semseg3d/CMakeFiles/semseg3d_testLBPComputation.dir/progs/testLBPComputation.cpp.s
+.PHONY : progs/testLBPComputation.cpp.s
+
+progs/testRayFeatComputation.o: progs/testRayFeatComputation.cpp.o
+.PHONY : progs/testRayFeatComputation.o
+
+# target to build an object file
+progs/testRayFeatComputation.cpp.o:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testRayFeatComputation.dir/build.make semseg3d/CMakeFiles/semseg3d_testRayFeatComputation.dir/progs/testRayFeatComputation.cpp.o
+.PHONY : progs/testRayFeatComputation.cpp.o
+
+progs/testRayFeatComputation.i: progs/testRayFeatComputation.cpp.i
+.PHONY : progs/testRayFeatComputation.i
+
+# target to preprocess a source file
+progs/testRayFeatComputation.cpp.i:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testRayFeatComputation.dir/build.make semseg3d/CMakeFiles/semseg3d_testRayFeatComputation.dir/progs/testRayFeatComputation.cpp.i
+.PHONY : progs/testRayFeatComputation.cpp.i
+
+progs/testRayFeatComputation.s: progs/testRayFeatComputation.cpp.s
+.PHONY : progs/testRayFeatComputation.s
+
+# target to generate assembly for a file
+progs/testRayFeatComputation.cpp.s:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testRayFeatComputation.dir/build.make semseg3d/CMakeFiles/semseg3d_testRayFeatComputation.dir/progs/testRayFeatComputation.cpp.s
+.PHONY : progs/testRayFeatComputation.cpp.s
+
+progs/testSemanticSegmentation.o: progs/testSemanticSegmentation.cpp.o
+.PHONY : progs/testSemanticSegmentation.o
+
+# target to build an object file
+progs/testSemanticSegmentation.cpp.o:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation.dir/build.make semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation.dir/progs/testSemanticSegmentation.cpp.o
+.PHONY : progs/testSemanticSegmentation.cpp.o
+
+progs/testSemanticSegmentation.i: progs/testSemanticSegmentation.cpp.i
+.PHONY : progs/testSemanticSegmentation.i
+
+# target to preprocess a source file
+progs/testSemanticSegmentation.cpp.i:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation.dir/build.make semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation.dir/progs/testSemanticSegmentation.cpp.i
+.PHONY : progs/testSemanticSegmentation.cpp.i
+
+progs/testSemanticSegmentation.s: progs/testSemanticSegmentation.cpp.s
+.PHONY : progs/testSemanticSegmentation.s
+
+# target to generate assembly for a file
+progs/testSemanticSegmentation.cpp.s:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation.dir/build.make semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation.dir/progs/testSemanticSegmentation.cpp.s
+.PHONY : progs/testSemanticSegmentation.cpp.s
+
+semseg/SemSegContextTree.o: semseg/SemSegContextTree.cpp.o
+.PHONY : semseg/SemSegContextTree.o
+
+# target to build an object file
+semseg/SemSegContextTree.cpp.o:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/nice_semseg3d.dir/build.make semseg3d/CMakeFiles/nice_semseg3d.dir/semseg/SemSegContextTree.cpp.o
+.PHONY : semseg/SemSegContextTree.cpp.o
+
+semseg/SemSegContextTree.i: semseg/SemSegContextTree.cpp.i
+.PHONY : semseg/SemSegContextTree.i
+
+# target to preprocess a source file
+semseg/SemSegContextTree.cpp.i:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/nice_semseg3d.dir/build.make semseg3d/CMakeFiles/nice_semseg3d.dir/semseg/SemSegContextTree.cpp.i
+.PHONY : semseg/SemSegContextTree.cpp.i
+
+semseg/SemSegContextTree.s: semseg/SemSegContextTree.cpp.s
+.PHONY : semseg/SemSegContextTree.s
+
+# target to generate assembly for a file
+semseg/SemSegContextTree.cpp.s:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/nice_semseg3d.dir/build.make semseg3d/CMakeFiles/nice_semseg3d.dir/semseg/SemSegContextTree.cpp.s
+.PHONY : semseg/SemSegContextTree.cpp.s
+
+semseg/SemSegTools.o: semseg/SemSegTools.cpp.o
+.PHONY : semseg/SemSegTools.o
+
+# target to build an object file
+semseg/SemSegTools.cpp.o:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/nice_semseg3d.dir/build.make semseg3d/CMakeFiles/nice_semseg3d.dir/semseg/SemSegTools.cpp.o
+.PHONY : semseg/SemSegTools.cpp.o
+
+semseg/SemSegTools.i: semseg/SemSegTools.cpp.i
+.PHONY : semseg/SemSegTools.i
+
+# target to preprocess a source file
+semseg/SemSegTools.cpp.i:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/nice_semseg3d.dir/build.make semseg3d/CMakeFiles/nice_semseg3d.dir/semseg/SemSegTools.cpp.i
+.PHONY : semseg/SemSegTools.cpp.i
+
+semseg/SemSegTools.s: semseg/SemSegTools.cpp.s
+.PHONY : semseg/SemSegTools.s
+
+# target to generate assembly for a file
+semseg/SemSegTools.cpp.s:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/nice_semseg3d.dir/build.make semseg3d/CMakeFiles/nice_semseg3d.dir/semseg/SemSegTools.cpp.s
+.PHONY : semseg/SemSegTools.cpp.s
+
+semseg/SemanticSegmentation.o: semseg/SemanticSegmentation.cpp.o
+.PHONY : semseg/SemanticSegmentation.o
+
+# target to build an object file
+semseg/SemanticSegmentation.cpp.o:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/nice_semseg3d.dir/build.make semseg3d/CMakeFiles/nice_semseg3d.dir/semseg/SemanticSegmentation.cpp.o
+.PHONY : semseg/SemanticSegmentation.cpp.o
+
+semseg/SemanticSegmentation.i: semseg/SemanticSegmentation.cpp.i
+.PHONY : semseg/SemanticSegmentation.i
+
+# target to preprocess a source file
+semseg/SemanticSegmentation.cpp.i:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/nice_semseg3d.dir/build.make semseg3d/CMakeFiles/nice_semseg3d.dir/semseg/SemanticSegmentation.cpp.i
+.PHONY : semseg/SemanticSegmentation.cpp.i
+
+semseg/SemanticSegmentation.s: semseg/SemanticSegmentation.cpp.s
+.PHONY : semseg/SemanticSegmentation.s
+
+# target to generate assembly for a file
+semseg/SemanticSegmentation.cpp.s:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/nice_semseg3d.dir/build.make semseg3d/CMakeFiles/nice_semseg3d.dir/semseg/SemanticSegmentation.cpp.s
+.PHONY : semseg/SemanticSegmentation.cpp.s
+
+semseg/operations/Operations.o: semseg/operations/Operations.cpp.o
+.PHONY : semseg/operations/Operations.o
+
+# target to build an object file
+semseg/operations/Operations.cpp.o:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/nice_semseg3d.dir/build.make semseg3d/CMakeFiles/nice_semseg3d.dir/semseg/operations/Operations.cpp.o
+.PHONY : semseg/operations/Operations.cpp.o
+
+semseg/operations/Operations.i: semseg/operations/Operations.cpp.i
+.PHONY : semseg/operations/Operations.i
+
+# target to preprocess a source file
+semseg/operations/Operations.cpp.i:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/nice_semseg3d.dir/build.make semseg3d/CMakeFiles/nice_semseg3d.dir/semseg/operations/Operations.cpp.i
+.PHONY : semseg/operations/Operations.cpp.i
+
+semseg/operations/Operations.s: semseg/operations/Operations.cpp.s
+.PHONY : semseg/operations/Operations.s
+
+# target to generate assembly for a file
+semseg/operations/Operations.cpp.s:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/nice_semseg3d.dir/build.make semseg3d/CMakeFiles/nice_semseg3d.dir/semseg/operations/Operations.cpp.s
+.PHONY : semseg/operations/Operations.cpp.s
+
+semseg3d_makeLabeledImage_automoc.o: semseg3d_makeLabeledImage_automoc.cpp.o
+.PHONY : semseg3d_makeLabeledImage_automoc.o
+
+# target to build an object file
+semseg3d_makeLabeledImage_automoc.cpp.o:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_makeLabeledImage.dir/build.make semseg3d/CMakeFiles/semseg3d_makeLabeledImage.dir/semseg3d_makeLabeledImage_automoc.cpp.o
+.PHONY : semseg3d_makeLabeledImage_automoc.cpp.o
+
+semseg3d_makeLabeledImage_automoc.i: semseg3d_makeLabeledImage_automoc.cpp.i
+.PHONY : semseg3d_makeLabeledImage_automoc.i
+
+# target to preprocess a source file
+semseg3d_makeLabeledImage_automoc.cpp.i:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_makeLabeledImage.dir/build.make semseg3d/CMakeFiles/semseg3d_makeLabeledImage.dir/semseg3d_makeLabeledImage_automoc.cpp.i
+.PHONY : semseg3d_makeLabeledImage_automoc.cpp.i
+
+semseg3d_makeLabeledImage_automoc.s: semseg3d_makeLabeledImage_automoc.cpp.s
+.PHONY : semseg3d_makeLabeledImage_automoc.s
+
+# target to generate assembly for a file
+semseg3d_makeLabeledImage_automoc.cpp.s:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_makeLabeledImage.dir/build.make semseg3d/CMakeFiles/semseg3d_makeLabeledImage.dir/semseg3d_makeLabeledImage_automoc.cpp.s
+.PHONY : semseg3d_makeLabeledImage_automoc.cpp.s
+
+semseg3d_testLBPComputation_automoc.o: semseg3d_testLBPComputation_automoc.cpp.o
+.PHONY : semseg3d_testLBPComputation_automoc.o
+
+# target to build an object file
+semseg3d_testLBPComputation_automoc.cpp.o:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testLBPComputation.dir/build.make semseg3d/CMakeFiles/semseg3d_testLBPComputation.dir/semseg3d_testLBPComputation_automoc.cpp.o
+.PHONY : semseg3d_testLBPComputation_automoc.cpp.o
+
+semseg3d_testLBPComputation_automoc.i: semseg3d_testLBPComputation_automoc.cpp.i
+.PHONY : semseg3d_testLBPComputation_automoc.i
+
+# target to preprocess a source file
+semseg3d_testLBPComputation_automoc.cpp.i:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testLBPComputation.dir/build.make semseg3d/CMakeFiles/semseg3d_testLBPComputation.dir/semseg3d_testLBPComputation_automoc.cpp.i
+.PHONY : semseg3d_testLBPComputation_automoc.cpp.i
+
+semseg3d_testLBPComputation_automoc.s: semseg3d_testLBPComputation_automoc.cpp.s
+.PHONY : semseg3d_testLBPComputation_automoc.s
+
+# target to generate assembly for a file
+semseg3d_testLBPComputation_automoc.cpp.s:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testLBPComputation.dir/build.make semseg3d/CMakeFiles/semseg3d_testLBPComputation.dir/semseg3d_testLBPComputation_automoc.cpp.s
+.PHONY : semseg3d_testLBPComputation_automoc.cpp.s
+
+semseg3d_testRayFeatComputation_automoc.o: semseg3d_testRayFeatComputation_automoc.cpp.o
+.PHONY : semseg3d_testRayFeatComputation_automoc.o
+
+# target to build an object file
+semseg3d_testRayFeatComputation_automoc.cpp.o:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testRayFeatComputation.dir/build.make semseg3d/CMakeFiles/semseg3d_testRayFeatComputation.dir/semseg3d_testRayFeatComputation_automoc.cpp.o
+.PHONY : semseg3d_testRayFeatComputation_automoc.cpp.o
+
+semseg3d_testRayFeatComputation_automoc.i: semseg3d_testRayFeatComputation_automoc.cpp.i
+.PHONY : semseg3d_testRayFeatComputation_automoc.i
+
+# target to preprocess a source file
+semseg3d_testRayFeatComputation_automoc.cpp.i:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testRayFeatComputation.dir/build.make semseg3d/CMakeFiles/semseg3d_testRayFeatComputation.dir/semseg3d_testRayFeatComputation_automoc.cpp.i
+.PHONY : semseg3d_testRayFeatComputation_automoc.cpp.i
+
+semseg3d_testRayFeatComputation_automoc.s: semseg3d_testRayFeatComputation_automoc.cpp.s
+.PHONY : semseg3d_testRayFeatComputation_automoc.s
+
+# target to generate assembly for a file
+semseg3d_testRayFeatComputation_automoc.cpp.s:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testRayFeatComputation.dir/build.make semseg3d/CMakeFiles/semseg3d_testRayFeatComputation.dir/semseg3d_testRayFeatComputation_automoc.cpp.s
+.PHONY : semseg3d_testRayFeatComputation_automoc.cpp.s
+
+semseg3d_testSemanticSegmentation_automoc.o: semseg3d_testSemanticSegmentation_automoc.cpp.o
+.PHONY : semseg3d_testSemanticSegmentation_automoc.o
+
+# target to build an object file
+semseg3d_testSemanticSegmentation_automoc.cpp.o:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation.dir/build.make semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation.dir/semseg3d_testSemanticSegmentation_automoc.cpp.o
+.PHONY : semseg3d_testSemanticSegmentation_automoc.cpp.o
+
+semseg3d_testSemanticSegmentation_automoc.i: semseg3d_testSemanticSegmentation_automoc.cpp.i
+.PHONY : semseg3d_testSemanticSegmentation_automoc.i
+
+# target to preprocess a source file
+semseg3d_testSemanticSegmentation_automoc.cpp.i:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation.dir/build.make semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation.dir/semseg3d_testSemanticSegmentation_automoc.cpp.i
+.PHONY : semseg3d_testSemanticSegmentation_automoc.cpp.i
+
+semseg3d_testSemanticSegmentation_automoc.s: semseg3d_testSemanticSegmentation_automoc.cpp.s
+.PHONY : semseg3d_testSemanticSegmentation_automoc.s
+
+# target to generate assembly for a file
+semseg3d_testSemanticSegmentation_automoc.cpp.s:
+	cd /home/sickert/src/nice-gl && $(MAKE) -f semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation.dir/build.make semseg3d/CMakeFiles/semseg3d_testSemanticSegmentation.dir/semseg3d_testSemanticSegmentation_automoc.cpp.s
+.PHONY : semseg3d_testSemanticSegmentation_automoc.cpp.s
+
+# Help Target
+help:
+	@echo "The following are some of the valid targets for this Makefile:"
+	@echo "... all (the default if no target is provided)"
+	@echo "... clean"
+	@echo "... depend"
+	@echo "... edit_cache"
+	@echo "... install"
+	@echo "... install/local"
+	@echo "... install/strip"
+	@echo "... list_install_components"
+	@echo "... nice_semseg3d"
+	@echo "... nice_semseg3d_automoc"
+	@echo "... package"
+	@echo "... package_source"
+	@echo "... rebuild_cache"
+	@echo "... semseg3d_makeLabeledImage"
+	@echo "... semseg3d_makeLabeledImage_automoc"
+	@echo "... semseg3d_testLBPComputation"
+	@echo "... semseg3d_testLBPComputation_automoc"
+	@echo "... semseg3d_testRayFeatComputation"
+	@echo "... semseg3d_testRayFeatComputation_automoc"
+	@echo "... semseg3d_testSemanticSegmentation"
+	@echo "... semseg3d_testSemanticSegmentation_automoc"
+	@echo "... nice_semseg3d_automoc.o"
+	@echo "... nice_semseg3d_automoc.i"
+	@echo "... nice_semseg3d_automoc.s"
+	@echo "... progs/makeLabeledImage.o"
+	@echo "... progs/makeLabeledImage.i"
+	@echo "... progs/makeLabeledImage.s"
+	@echo "... progs/testLBPComputation.o"
+	@echo "... progs/testLBPComputation.i"
+	@echo "... progs/testLBPComputation.s"
+	@echo "... progs/testRayFeatComputation.o"
+	@echo "... progs/testRayFeatComputation.i"
+	@echo "... progs/testRayFeatComputation.s"
+	@echo "... progs/testSemanticSegmentation.o"
+	@echo "... progs/testSemanticSegmentation.i"
+	@echo "... progs/testSemanticSegmentation.s"
+	@echo "... semseg/SemSegContextTree.o"
+	@echo "... semseg/SemSegContextTree.i"
+	@echo "... semseg/SemSegContextTree.s"
+	@echo "... semseg/SemSegTools.o"
+	@echo "... semseg/SemSegTools.i"
+	@echo "... semseg/SemSegTools.s"
+	@echo "... semseg/SemanticSegmentation.o"
+	@echo "... semseg/SemanticSegmentation.i"
+	@echo "... semseg/SemanticSegmentation.s"
+	@echo "... semseg/operations/Operations.o"
+	@echo "... semseg/operations/Operations.i"
+	@echo "... semseg/operations/Operations.s"
+	@echo "... semseg3d_makeLabeledImage_automoc.o"
+	@echo "... semseg3d_makeLabeledImage_automoc.i"
+	@echo "... semseg3d_makeLabeledImage_automoc.s"
+	@echo "... semseg3d_testLBPComputation_automoc.o"
+	@echo "... semseg3d_testLBPComputation_automoc.i"
+	@echo "... semseg3d_testLBPComputation_automoc.s"
+	@echo "... semseg3d_testRayFeatComputation_automoc.o"
+	@echo "... semseg3d_testRayFeatComputation_automoc.i"
+	@echo "... semseg3d_testRayFeatComputation_automoc.s"
+	@echo "... semseg3d_testSemanticSegmentation_automoc.o"
+	@echo "... semseg3d_testSemanticSegmentation_automoc.i"
+	@echo "... semseg3d_testSemanticSegmentation_automoc.s"
+.PHONY : help
+
+
+
+#=============================================================================
+# Special targets to cleanup operation of make.
+
+# Special rule to run CMake to check the build system integrity.
+# No rule that depends on this can have commands that come from listfiles
+# because they might be regenerated.
+cmake_check_build_system:
+	cd /home/sickert/src/nice-gl && $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
+.PHONY : cmake_check_build_system
 

+ 17 - 10
semseg/SemSegContextTree.cpp

@@ -52,6 +52,7 @@ SemSegContextTree::SemSegContextTree () : SemanticSegmentation ()
   this->useShannonEntropy   = true;
   this->nbTrees             = 10;
   this->randomTests         = 10;
+  this->useAltTristimulus   = false;
   this->useGradient         = true;
   this->useWeijer           = false;
   this->useAdditionalLayer  = false;
@@ -95,6 +96,7 @@ SemSegContextTree::SemSegContextTree (
   this->nbTrees             = conf->gI ( section, "amount_trees", 10 );
   this->randomTests         = conf->gI ( section, "random_tests", 10 );
 
+  this->useAltTristimulus   = conf->gB ( featsec, "use_alt_trist", false );
   this->useGradient         = conf->gB ( featsec, "use_gradient", true );
   this->useWeijer           = conf->gB ( featsec, "use_weijer", true );
   this->useAdditionalLayer  = conf->gB ( featsec, "use_additional_layer", false );
@@ -1464,8 +1466,16 @@ void SemSegContextTree::addFeatureMaps (
           G = ( double )imgData.get( x, y, z, 1 ) / 255.0;
           B = ( double )imgData.get( x, y, z, 2 ) / 255.0;
 
-          ColorConversion::ccRGBtoXYZ( R, G, B, &X, &Y, &Z, 0 );
-          ColorConversion::ccXYZtoCIE_Lab( X, Y, Z, &L, &a, &b, 0 );
+          if ( useAltTristimulus )
+          {
+            ColorConversion::ccRGBtoXYZ( R, G, B, &X, &Y, &Z, 4 );
+            ColorConversion::ccXYZtoCIE_Lab( X, Y, Z, &L, &a, &b, 4 );
+          }
+          else
+          {
+            ColorConversion::ccRGBtoXYZ( R, G, B, &X, &Y, &Z, 0 );
+            ColorConversion::ccXYZtoCIE_Lab( X, Y, Z, &L, &a, &b, 0 );
+          }
 
           imgData.set( x, y, z, L, 0 );
           imgData.set( x, y, z, a, 1 );
@@ -2206,14 +2216,11 @@ void SemSegContextTree::restore ( std::istream & is, int format )
           {
             if ( forest[t][n].feat == NULL )
             {
-//              for ( uint c = 0; c < ops[o].size(); c++ )
-//              {
-                if ( ops[o][o2]->getOps() == feattype )
-                {
-                  forest[t][n].feat = ops[o][o2]->clone();
-                  break;
-                }
-//              }
+              if ( ops[o][o2]->getOps() == feattype )
+              {
+                forest[t][n].feat = ops[o][o2]->clone();
+                break;
+              }
             }
           }
         }

+ 3 - 0
semseg/SemSegContextTree.h

@@ -108,6 +108,9 @@ private:
   /** Number of trees used for the forest */
   int nbTrees;
 
+  /** whether to use alternative tristimulus for CIE_Lab that matches openCV or not */
+  bool useAltTristimulus;
+
   /** use Gradient image or not */
   bool useGradient;
 

+ 1 - 0
semseg/operations/Operations.cpp

@@ -7,6 +7,7 @@ using namespace NICE;
 Operation::Operation()
 {
   init = false;
+  context = false;
 }
 
 void Operation::set ( int _x1, int _y1, int _z1, int _x2, int _y2, int _z2, int _channel1, int _channel2, int _featType )