diff --git a/graph/build/CMakeFiles/Makefile2 b/graph/build/CMakeFiles/Makefile2 deleted file mode 100644 index 82297d5..0000000 --- a/graph/build/CMakeFiles/Makefile2 +++ /dev/null @@ -1,137 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 2.8 - -# Default target executed when no arguments are given to make. -default_target: all -.PHONY : default_target - -# The main recursive all target -all: -.PHONY : all - -# The main recursive preinstall target -preinstall: -.PHONY : preinstall - -#============================================================================= -# 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 = /usr/local/Cellar/cmake/2.8.12.2/bin/cmake - -# The command to remove a file. -RM = /usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E remove -f - -# Escaping for special characters. -EQUALS = = - -# The program to use to edit the cache. -CMAKE_EDIT_COMMAND = /usr/local/Cellar/cmake/2.8.12.2/bin/ccmake - -# The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /Users/hans/MasterThesis/code/cpp/graph - -# The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /Users/hans/MasterThesis/code/cpp/graph/build - -#============================================================================= -# Target rules for target CMakeFiles/segment.dir - -# All Build rule for target. -CMakeFiles/segment.dir/all: - $(MAKE) -f CMakeFiles/segment.dir/build.make CMakeFiles/segment.dir/depend - $(MAKE) -f CMakeFiles/segment.dir/build.make CMakeFiles/segment.dir/build - $(CMAKE_COMMAND) -E cmake_progress_report /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles 1 - @echo "Built target segment" -.PHONY : CMakeFiles/segment.dir/all - -# Include target in all. -all: CMakeFiles/segment.dir/all -.PHONY : all - -# Build rule for subdir invocation for target. -CMakeFiles/segment.dir/rule: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles 1 - $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/segment.dir/all - $(CMAKE_COMMAND) -E cmake_progress_start /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles 0 -.PHONY : CMakeFiles/segment.dir/rule - -# Convenience name for target. -segment: CMakeFiles/segment.dir/rule -.PHONY : segment - -# clean rule for target. -CMakeFiles/segment.dir/clean: - $(MAKE) -f CMakeFiles/segment.dir/build.make CMakeFiles/segment.dir/clean -.PHONY : CMakeFiles/segment.dir/clean - -# clean rule for target. -clean: CMakeFiles/segment.dir/clean -.PHONY : clean - -#============================================================================= -# Target rules for target CMakeFiles/segment_felz.dir - -# All Build rule for target. -CMakeFiles/segment_felz.dir/all: - $(MAKE) -f CMakeFiles/segment_felz.dir/build.make CMakeFiles/segment_felz.dir/depend - $(MAKE) -f CMakeFiles/segment_felz.dir/build.make CMakeFiles/segment_felz.dir/build - $(CMAKE_COMMAND) -E cmake_progress_report /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles 2 - @echo "Built target segment_felz" -.PHONY : CMakeFiles/segment_felz.dir/all - -# Include target in all. -all: CMakeFiles/segment_felz.dir/all -.PHONY : all - -# Build rule for subdir invocation for target. -CMakeFiles/segment_felz.dir/rule: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles 1 - $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/segment_felz.dir/all - $(CMAKE_COMMAND) -E cmake_progress_start /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles 0 -.PHONY : CMakeFiles/segment_felz.dir/rule - -# Convenience name for target. -segment_felz: CMakeFiles/segment_felz.dir/rule -.PHONY : segment_felz - -# clean rule for target. -CMakeFiles/segment_felz.dir/clean: - $(MAKE) -f CMakeFiles/segment_felz.dir/build.make CMakeFiles/segment_felz.dir/clean -.PHONY : CMakeFiles/segment_felz.dir/clean - -# clean rule for target. -clean: CMakeFiles/segment_felz.dir/clean -.PHONY : clean - -#============================================================================= -# 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: - $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 -.PHONY : cmake_check_build_system - diff --git a/graph/build/CMakeFiles/TargetDirectories.txt b/graph/build/CMakeFiles/TargetDirectories.txt deleted file mode 100644 index b8ba326..0000000 --- a/graph/build/CMakeFiles/TargetDirectories.txt +++ /dev/null @@ -1,2 +0,0 @@ -/Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/segment.dir -/Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/segment_felz.dir diff --git a/graph/build/CMakeFiles/segment.dir/build.make b/graph/build/CMakeFiles/segment.dir/build.make deleted file mode 100644 index adbe23f..0000000 --- a/graph/build/CMakeFiles/segment.dir/build.make +++ /dev/null @@ -1,152 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 2.8 - -#============================================================================= -# 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 = /usr/local/Cellar/cmake/2.8.12.2/bin/cmake - -# The command to remove a file. -RM = /usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E remove -f - -# Escaping for special characters. -EQUALS = = - -# The program to use to edit the cache. -CMAKE_EDIT_COMMAND = /usr/local/Cellar/cmake/2.8.12.2/bin/ccmake - -# The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /Users/hans/MasterThesis/code/cpp/graph - -# The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /Users/hans/MasterThesis/code/cpp/graph/build - -# Include any dependencies generated for this target. -include CMakeFiles/segment.dir/depend.make - -# Include the progress variables for this target. -include CMakeFiles/segment.dir/progress.make - -# Include the compile flags for this target's objects. -include CMakeFiles/segment.dir/flags.make - -CMakeFiles/segment.dir/src/segment.cpp.o: CMakeFiles/segment.dir/flags.make -CMakeFiles/segment.dir/src/segment.cpp.o: ../src/segment.cpp - $(CMAKE_COMMAND) -E cmake_progress_report /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles $(CMAKE_PROGRESS_1) - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Building CXX object CMakeFiles/segment.dir/src/segment.cpp.o" - /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -o CMakeFiles/segment.dir/src/segment.cpp.o -c /Users/hans/MasterThesis/code/cpp/graph/src/segment.cpp - -CMakeFiles/segment.dir/src/segment.cpp.i: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/segment.dir/src/segment.cpp.i" - /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -E /Users/hans/MasterThesis/code/cpp/graph/src/segment.cpp > CMakeFiles/segment.dir/src/segment.cpp.i - -CMakeFiles/segment.dir/src/segment.cpp.s: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/segment.dir/src/segment.cpp.s" - /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -S /Users/hans/MasterThesis/code/cpp/graph/src/segment.cpp -o CMakeFiles/segment.dir/src/segment.cpp.s - -CMakeFiles/segment.dir/src/segment.cpp.o.requires: -.PHONY : CMakeFiles/segment.dir/src/segment.cpp.o.requires - -CMakeFiles/segment.dir/src/segment.cpp.o.provides: CMakeFiles/segment.dir/src/segment.cpp.o.requires - $(MAKE) -f CMakeFiles/segment.dir/build.make CMakeFiles/segment.dir/src/segment.cpp.o.provides.build -.PHONY : CMakeFiles/segment.dir/src/segment.cpp.o.provides - -CMakeFiles/segment.dir/src/segment.cpp.o.provides.build: CMakeFiles/segment.dir/src/segment.cpp.o - -# Object files for target segment -segment_OBJECTS = \ -"CMakeFiles/segment.dir/src/segment.cpp.o" - -# External object files for target segment -segment_EXTERNAL_OBJECTS = - -segment: CMakeFiles/segment.dir/src/segment.cpp.o -segment: CMakeFiles/segment.dir/build.make -segment: /usr/local/lib/libboost_python-mt.a -segment: /opt/ros/hydro/install_isolated/lib/libopencv_viz.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_videostab.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_video.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_ts.a -segment: /opt/ros/hydro/install_isolated/lib/libopencv_superres.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_stitching.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_softcascade.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_shape.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_photo.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_optim.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_objdetect.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_nonfree.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_ml.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_legacy.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_imgproc.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_highgui.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_flann.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_features2d.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_cudawarping.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_cudastereo.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_cudaoptflow.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_cudaimgproc.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_cudafilters.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_cudafeatures2d.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_cudabgsegm.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_cudaarithm.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_cuda.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_core.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_contrib.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_calib3d.3.0.0.dylib -segment: /usr/lib/libpython2.7.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_cudawarping.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_legacy.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_cudaimgproc.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_cudafilters.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_video.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_objdetect.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_nonfree.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_ml.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_cudaarithm.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_calib3d.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_features2d.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_highgui.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_imgproc.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_flann.3.0.0.dylib -segment: /opt/ros/hydro/install_isolated/lib/libopencv_core.3.0.0.dylib -segment: CMakeFiles/segment.dir/link.txt - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --red --bold "Linking CXX executable segment" - $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/segment.dir/link.txt --verbose=$(VERBOSE) - -# Rule to build all files generated by this target. -CMakeFiles/segment.dir/build: segment -.PHONY : CMakeFiles/segment.dir/build - -CMakeFiles/segment.dir/requires: CMakeFiles/segment.dir/src/segment.cpp.o.requires -.PHONY : CMakeFiles/segment.dir/requires - -CMakeFiles/segment.dir/clean: - $(CMAKE_COMMAND) -P CMakeFiles/segment.dir/cmake_clean.cmake -.PHONY : CMakeFiles/segment.dir/clean - -CMakeFiles/segment.dir/depend: - cd /Users/hans/MasterThesis/code/cpp/graph/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /Users/hans/MasterThesis/code/cpp/graph /Users/hans/MasterThesis/code/cpp/graph /Users/hans/MasterThesis/code/cpp/graph/build /Users/hans/MasterThesis/code/cpp/graph/build /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/segment.dir/DependInfo.cmake --color=$(COLOR) -.PHONY : CMakeFiles/segment.dir/depend - diff --git a/graph/build/CMakeFiles/segment.dir/cmake_clean.cmake b/graph/build/CMakeFiles/segment.dir/cmake_clean.cmake deleted file mode 100644 index e9e5d69..0000000 --- a/graph/build/CMakeFiles/segment.dir/cmake_clean.cmake +++ /dev/null @@ -1,10 +0,0 @@ -FILE(REMOVE_RECURSE - "CMakeFiles/segment.dir/src/segment.cpp.o" - "segment.pdb" - "segment" -) - -# Per-language clean rules from dependency scanning. -FOREACH(lang CXX) - INCLUDE(CMakeFiles/segment.dir/cmake_clean_${lang}.cmake OPTIONAL) -ENDFOREACH(lang) diff --git a/graph/build/CMakeFiles/segment.dir/depend.make b/graph/build/CMakeFiles/segment.dir/depend.make deleted file mode 100644 index cbf27ef..0000000 --- a/graph/build/CMakeFiles/segment.dir/depend.make +++ /dev/null @@ -1,83 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 2.8 - -CMakeFiles/segment.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/__multiarray_api.h -CMakeFiles/segment.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/_neighborhood_iterator_imp.h -CMakeFiles/segment.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/_numpyconfig.h -CMakeFiles/segment.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/ndarrayobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/ndarraytypes.h -CMakeFiles/segment.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/npy_1_7_deprecated_api.h -CMakeFiles/segment.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/npy_common.h -CMakeFiles/segment.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/npy_cpu.h -CMakeFiles/segment.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/npy_endian.h -CMakeFiles/segment.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/numpyconfig.h -CMakeFiles/segment.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/old_defines.h -CMakeFiles/segment.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/utils.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/Python.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/abstract.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/boolobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/bufferobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/bytearrayobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/bytesobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/cellobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/ceval.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/classobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/cobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/code.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/codecs.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/compile.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/complexobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/descrobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/dictobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/dtoa.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/enumobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/eval.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/fileobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/floatobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/funcobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/genobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/import.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/intobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/intrcheck.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/iterobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/listobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/longobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/memoryobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/methodobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/modsupport.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/moduleobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/object.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/objimpl.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/patchlevel.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyarena.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pycapsule.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyconfig.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyctype.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pydebug.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyerrors.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyfpe.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pymacconfig.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pymath.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pymem.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyport.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pystate.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pystrcmp.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pystrtod.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pythonrun.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/rangeobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/setobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/sliceobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/stringobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/sysmodule.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/traceback.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/tupleobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/unicodeobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/warnings.h -CMakeFiles/segment.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/weakrefobject.h -CMakeFiles/segment.dir/src/segment.cpp.o: ../src/CVBoostConverter.hpp -CMakeFiles/segment.dir/src/segment.cpp.o: ../src/cluster.h -CMakeFiles/segment.dir/src/segment.cpp.o: ../src/edge.h -CMakeFiles/segment.dir/src/segment.cpp.o: ../src/segment-graph.h -CMakeFiles/segment.dir/src/segment.cpp.o: ../src/segment-image.h -CMakeFiles/segment.dir/src/segment.cpp.o: ../src/segment.cpp - diff --git a/graph/build/CMakeFiles/segment.dir/flags.make b/graph/build/CMakeFiles/segment.dir/flags.make deleted file mode 100644 index f783b80..0000000 --- a/graph/build/CMakeFiles/segment.dir/flags.make +++ /dev/null @@ -1,8 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 2.8 - -# compile CXX with /usr/bin/c++ -CXX_FLAGS = -std=c++11 -O3 -I/System/Library/Frameworks/Python.framework/Headers -I/Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include - -CXX_DEFINES = - diff --git a/graph/build/CMakeFiles/segment.dir/src/segment.cpp.o b/graph/build/CMakeFiles/segment.dir/src/segment.cpp.o deleted file mode 100644 index 24c1833..0000000 Binary files a/graph/build/CMakeFiles/segment.dir/src/segment.cpp.o and /dev/null differ diff --git a/graph/build/CMakeFiles/segment_felz.dir/build.make b/graph/build/CMakeFiles/segment_felz.dir/build.make deleted file mode 100644 index 4796466..0000000 --- a/graph/build/CMakeFiles/segment_felz.dir/build.make +++ /dev/null @@ -1,152 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 2.8 - -#============================================================================= -# 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 = /usr/local/Cellar/cmake/2.8.12.2/bin/cmake - -# The command to remove a file. -RM = /usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E remove -f - -# Escaping for special characters. -EQUALS = = - -# The program to use to edit the cache. -CMAKE_EDIT_COMMAND = /usr/local/Cellar/cmake/2.8.12.2/bin/ccmake - -# The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /Users/hans/MasterThesis/code/cpp/graph - -# The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /Users/hans/MasterThesis/code/cpp/graph/build - -# Include any dependencies generated for this target. -include CMakeFiles/segment_felz.dir/depend.make - -# Include the progress variables for this target. -include CMakeFiles/segment_felz.dir/progress.make - -# Include the compile flags for this target's objects. -include CMakeFiles/segment_felz.dir/flags.make - -CMakeFiles/segment_felz.dir/src/segment.cpp.o: CMakeFiles/segment_felz.dir/flags.make -CMakeFiles/segment_felz.dir/src/segment.cpp.o: ../src/segment.cpp - $(CMAKE_COMMAND) -E cmake_progress_report /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles $(CMAKE_PROGRESS_1) - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Building CXX object CMakeFiles/segment_felz.dir/src/segment.cpp.o" - /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -o CMakeFiles/segment_felz.dir/src/segment.cpp.o -c /Users/hans/MasterThesis/code/cpp/graph/src/segment.cpp - -CMakeFiles/segment_felz.dir/src/segment.cpp.i: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/segment_felz.dir/src/segment.cpp.i" - /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -E /Users/hans/MasterThesis/code/cpp/graph/src/segment.cpp > CMakeFiles/segment_felz.dir/src/segment.cpp.i - -CMakeFiles/segment_felz.dir/src/segment.cpp.s: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/segment_felz.dir/src/segment.cpp.s" - /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -S /Users/hans/MasterThesis/code/cpp/graph/src/segment.cpp -o CMakeFiles/segment_felz.dir/src/segment.cpp.s - -CMakeFiles/segment_felz.dir/src/segment.cpp.o.requires: -.PHONY : CMakeFiles/segment_felz.dir/src/segment.cpp.o.requires - -CMakeFiles/segment_felz.dir/src/segment.cpp.o.provides: CMakeFiles/segment_felz.dir/src/segment.cpp.o.requires - $(MAKE) -f CMakeFiles/segment_felz.dir/build.make CMakeFiles/segment_felz.dir/src/segment.cpp.o.provides.build -.PHONY : CMakeFiles/segment_felz.dir/src/segment.cpp.o.provides - -CMakeFiles/segment_felz.dir/src/segment.cpp.o.provides.build: CMakeFiles/segment_felz.dir/src/segment.cpp.o - -# Object files for target segment_felz -segment_felz_OBJECTS = \ -"CMakeFiles/segment_felz.dir/src/segment.cpp.o" - -# External object files for target segment_felz -segment_felz_EXTERNAL_OBJECTS = - -segment_felz.so: CMakeFiles/segment_felz.dir/src/segment.cpp.o -segment_felz.so: CMakeFiles/segment_felz.dir/build.make -segment_felz.so: /usr/local/lib/libboost_python-mt.a -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_viz.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_videostab.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_video.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_ts.a -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_superres.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_stitching.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_softcascade.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_shape.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_photo.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_optim.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_objdetect.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_nonfree.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_ml.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_legacy.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_imgproc.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_highgui.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_flann.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_features2d.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudawarping.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudastereo.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudaoptflow.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudaimgproc.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudafilters.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudafeatures2d.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudabgsegm.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudaarithm.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_cuda.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_core.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_contrib.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_calib3d.3.0.0.dylib -segment_felz.so: /usr/lib/libpython2.7.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudawarping.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_legacy.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudaimgproc.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudafilters.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_video.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_objdetect.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_nonfree.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_ml.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudaarithm.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_calib3d.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_features2d.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_highgui.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_imgproc.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_flann.3.0.0.dylib -segment_felz.so: /opt/ros/hydro/install_isolated/lib/libopencv_core.3.0.0.dylib -segment_felz.so: CMakeFiles/segment_felz.dir/link.txt - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --red --bold "Linking CXX shared module segment_felz.so" - $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/segment_felz.dir/link.txt --verbose=$(VERBOSE) - -# Rule to build all files generated by this target. -CMakeFiles/segment_felz.dir/build: segment_felz.so -.PHONY : CMakeFiles/segment_felz.dir/build - -CMakeFiles/segment_felz.dir/requires: CMakeFiles/segment_felz.dir/src/segment.cpp.o.requires -.PHONY : CMakeFiles/segment_felz.dir/requires - -CMakeFiles/segment_felz.dir/clean: - $(CMAKE_COMMAND) -P CMakeFiles/segment_felz.dir/cmake_clean.cmake -.PHONY : CMakeFiles/segment_felz.dir/clean - -CMakeFiles/segment_felz.dir/depend: - cd /Users/hans/MasterThesis/code/cpp/graph/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /Users/hans/MasterThesis/code/cpp/graph /Users/hans/MasterThesis/code/cpp/graph /Users/hans/MasterThesis/code/cpp/graph/build /Users/hans/MasterThesis/code/cpp/graph/build /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/segment_felz.dir/DependInfo.cmake --color=$(COLOR) -.PHONY : CMakeFiles/segment_felz.dir/depend - diff --git a/graph/build/CMakeFiles/segment_felz.dir/cmake_clean.cmake b/graph/build/CMakeFiles/segment_felz.dir/cmake_clean.cmake deleted file mode 100644 index 3810e8b..0000000 --- a/graph/build/CMakeFiles/segment_felz.dir/cmake_clean.cmake +++ /dev/null @@ -1,10 +0,0 @@ -FILE(REMOVE_RECURSE - "CMakeFiles/segment_felz.dir/src/segment.cpp.o" - "segment_felz.pdb" - "segment_felz.so" -) - -# Per-language clean rules from dependency scanning. -FOREACH(lang CXX) - INCLUDE(CMakeFiles/segment_felz.dir/cmake_clean_${lang}.cmake OPTIONAL) -ENDFOREACH(lang) diff --git a/graph/build/CMakeFiles/segment_felz.dir/depend.make b/graph/build/CMakeFiles/segment_felz.dir/depend.make deleted file mode 100644 index e29cb19..0000000 --- a/graph/build/CMakeFiles/segment_felz.dir/depend.make +++ /dev/null @@ -1,83 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 2.8 - -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/__multiarray_api.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/_neighborhood_iterator_imp.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/_numpyconfig.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/ndarrayobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/ndarraytypes.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/npy_1_7_deprecated_api.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/npy_common.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/npy_cpu.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/npy_endian.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/numpyconfig.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/old_defines.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/utils.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/Python.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/abstract.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/boolobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/bufferobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/bytearrayobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/bytesobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/cellobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/ceval.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/classobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/cobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/code.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/codecs.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/compile.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/complexobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/descrobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/dictobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/dtoa.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/enumobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/eval.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/fileobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/floatobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/funcobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/genobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/import.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/intobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/intrcheck.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/iterobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/listobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/longobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/memoryobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/methodobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/modsupport.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/moduleobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/object.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/objimpl.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/patchlevel.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyarena.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pycapsule.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyconfig.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyctype.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pydebug.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyerrors.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyfpe.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pymacconfig.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pymath.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pymem.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyport.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pystate.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pystrcmp.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pystrtod.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pythonrun.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/rangeobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/setobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/sliceobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/stringobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/sysmodule.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/traceback.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/tupleobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/unicodeobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/warnings.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: /System/Library/Frameworks/Python.framework/Headers/weakrefobject.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: ../src/CVBoostConverter.hpp -CMakeFiles/segment_felz.dir/src/segment.cpp.o: ../src/cluster.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: ../src/edge.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: ../src/segment-graph.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: ../src/segment-image.h -CMakeFiles/segment_felz.dir/src/segment.cpp.o: ../src/segment.cpp - diff --git a/graph/build/CMakeFiles/segment_felz.dir/flags.make b/graph/build/CMakeFiles/segment_felz.dir/flags.make deleted file mode 100644 index 5e326bb..0000000 --- a/graph/build/CMakeFiles/segment_felz.dir/flags.make +++ /dev/null @@ -1,8 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 2.8 - -# compile CXX with /usr/bin/c++ -CXX_FLAGS = -std=c++11 -O3 -fPIC -I/System/Library/Frameworks/Python.framework/Headers -I/Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include - -CXX_DEFINES = -Dsegment_felz_EXPORTS - diff --git a/graph/build/CMakeFiles/segment_felz.dir/link.txt b/graph/build/CMakeFiles/segment_felz.dir/link.txt deleted file mode 100644 index 950f026..0000000 --- a/graph/build/CMakeFiles/segment_felz.dir/link.txt +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/c++ -std=c++11 -O3 -bundle -Wl,-headerpad_max_install_names -o segment_felz.so CMakeFiles/segment_felz.dir/src/segment.cpp.o /usr/local/lib/libboost_python-mt.a /opt/ros/hydro/install_isolated/lib/libopencv_viz.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_videostab.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_video.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_ts.a /opt/ros/hydro/install_isolated/lib/libopencv_superres.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_stitching.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_softcascade.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_shape.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_photo.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_optim.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_objdetect.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_nonfree.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_ml.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_legacy.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_imgproc.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_highgui.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_flann.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_features2d.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudawarping.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudastereo.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaoptflow.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaimgproc.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudafilters.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudafeatures2d.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudabgsegm.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaarithm.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cuda.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_core.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_contrib.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_calib3d.3.0.0.dylib /usr/lib/libpython2.7.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudawarping.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_legacy.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaimgproc.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudafilters.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_video.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_objdetect.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_nonfree.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_ml.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaarithm.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_calib3d.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_features2d.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_highgui.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_imgproc.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_flann.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_core.3.0.0.dylib diff --git a/graph/build/CMakeFiles/segment_felz.dir/src/segment.cpp.o b/graph/build/CMakeFiles/segment_felz.dir/src/segment.cpp.o deleted file mode 100644 index 83bd3f2..0000000 Binary files a/graph/build/CMakeFiles/segment_felz.dir/src/segment.cpp.o and /dev/null differ diff --git a/graph/build/segment b/graph/build/segment deleted file mode 100755 index 11a41d8..0000000 Binary files a/graph/build/segment and /dev/null differ diff --git a/graph/build/segment_felz.so b/graph/build/segment_felz.so deleted file mode 100755 index c9af357..0000000 Binary files a/graph/build/segment_felz.so and /dev/null differ diff --git a/tree/CMakeLists.txt b/tree/CMakeLists.txt new file mode 100644 index 0000000..52eaec4 --- /dev/null +++ b/tree/CMakeLists.txt @@ -0,0 +1,36 @@ +cmake_minimum_required(VERSION 2.6) +project(segmentationtree) +set(PROJECT_NAME segmentationtree) + +set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} ${CMAKE_CURRENT_SOURCE_DIR}/cmake) + +# Boost +set(Boost_USE_STATIC_LIBS ON) +set(Boost_USE_MULTITHREADED ON) +find_package(Boost COMPONENTS python REQUIRED) + +find_package(OpenCV REQUIRED) +find_package(PythonLibs REQUIRED) +find_package(NumPy REQUIRED) + +set(CMAKE_CXX_FLAGS "-std=c++11 -g") + +include_directories( + ${PYTHON_INCLUDE_DIRS} + ${NUMPY_INCLUDE_DIRS} +) + +add_library(segmentation_tree MODULE src/tree.cpp) +set_target_properties(segmentation_tree PROPERTIES PREFIX "") +target_link_libraries(segmentation_tree + ${Boost_LIBRARIES} + ${OpenCV_LIBRARIES} + ${PYTHON_LIBRARIES} +) + +add_executable(seg_tree src/tree.cpp) +target_link_libraries(seg_tree + ${Boost_LIBRARIES} + ${OpenCV_LIBRARIES} + ${PYTHON_LIBRARIES} +) diff --git a/tree/Makefile b/tree/Makefile new file mode 100644 index 0000000..aa7f1e1 --- /dev/null +++ b/tree/Makefile @@ -0,0 +1,7 @@ +BIN = thesis + +all: + c++ tree.cpp `pkg-config --cflags --libs opencv` `pkg-config --cflags python` -std=c++11 -g -o $(BIN) + +run: + ./$(BIN) diff --git a/tree/build/.eva_console_history b/tree/build/.eva_console_history new file mode 100644 index 0000000..2e78188 --- /dev/null +++ b/tree/build/.eva_console_history @@ -0,0 +1,2 @@ +_HiStOrY_V2_ +quit diff --git a/graph/build/CMakeCache.txt b/tree/build/CMakeCache.txt similarity index 92% rename from graph/build/CMakeCache.txt rename to tree/build/CMakeCache.txt index 09ff03e..84e8188 100644 --- a/graph/build/CMakeCache.txt +++ b/tree/build/CMakeCache.txt @@ -1,5 +1,5 @@ # This is the CMakeCache file. -# For build in directory: /Users/hans/MasterThesis/code/cpp/graph/build +# For build in directory: /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build # It was generated by CMake: /usr/local/Cellar/cmake/2.8.12.2/bin/cmake # You can edit this file to change values found and used by cmake. # If you do not want to change any of the values, simply exit the editor. @@ -229,13 +229,13 @@ PYTHON_LIBRARY:FILEPATH=/usr/lib/libpython2.7.dylib PYTHON_LIBRARY_DEBUG:FILEPATH=PYTHON_LIBRARY_DEBUG-NOTFOUND //Dependencies for the target -segment_felz_LIB_DEPENDS:STATIC=general;/usr/local/lib/libboost_python-mt.a;general;opencv_viz;general;opencv_videostab;general;opencv_video;general;opencv_ts;general;opencv_superres;general;opencv_stitching;general;opencv_softcascade;general;opencv_shape;general;opencv_photo;general;opencv_optim;general;opencv_objdetect;general;opencv_nonfree;general;opencv_ml;general;opencv_legacy;general;opencv_imgproc;general;opencv_highgui;general;opencv_flann;general;opencv_features2d;general;opencv_cudawarping;general;opencv_cudastereo;general;opencv_cudaoptflow;general;opencv_cudaimgproc;general;opencv_cudafilters;general;opencv_cudafeatures2d;general;opencv_cudabgsegm;general;opencv_cudaarithm;general;opencv_cuda;general;opencv_core;general;opencv_contrib;general;opencv_calib3d;general;/usr/lib/libpython2.7.dylib; +segmentation_tree_LIB_DEPENDS:STATIC=general;/usr/local/lib/libboost_python-mt.a;general;opencv_viz;general;opencv_videostab;general;opencv_video;general;opencv_ts;general;opencv_superres;general;opencv_stitching;general;opencv_softcascade;general;opencv_shape;general;opencv_photo;general;opencv_optim;general;opencv_objdetect;general;opencv_nonfree;general;opencv_ml;general;opencv_legacy;general;opencv_imgproc;general;opencv_highgui;general;opencv_flann;general;opencv_features2d;general;opencv_cudawarping;general;opencv_cudastereo;general;opencv_cudaoptflow;general;opencv_cudaimgproc;general;opencv_cudafilters;general;opencv_cudafeatures2d;general;opencv_cudabgsegm;general;opencv_cudaarithm;general;opencv_cuda;general;opencv_core;general;opencv_contrib;general;opencv_calib3d;general;/usr/lib/libpython2.7.dylib; //Value Computed by CMake -segmentationtree_BINARY_DIR:STATIC=/Users/hans/MasterThesis/code/cpp/graph/build +segmentationtree_BINARY_DIR:STATIC=/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build //Value Computed by CMake -segmentationtree_SOURCE_DIR:STATIC=/Users/hans/MasterThesis/code/cpp/graph +segmentationtree_SOURCE_DIR:STATIC=/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based ######################## @@ -259,7 +259,7 @@ CMAKE_BUILD_TOOL-ADVANCED:INTERNAL=1 //What is the target build tool cmake is generating for. CMAKE_BUILD_TOOL:INTERNAL=/usr/bin/make //This is the directory where this CMakeCache.txt was created -CMAKE_CACHEFILE_DIR:INTERNAL=/Users/hans/MasterThesis/code/cpp/graph/build +CMAKE_CACHEFILE_DIR:INTERNAL=/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build //Major version of cmake used to create the current loaded cache CMAKE_CACHE_MAJOR_VERSION:INTERNAL=2 //Minor version of cmake used to create the current loaded cache @@ -320,7 +320,7 @@ CMAKE_GENERATOR:INTERNAL=Unix Makefiles CMAKE_GENERATOR_TOOLSET:INTERNAL= //Start directory with the top level CMakeLists.txt file for this // project -CMAKE_HOME_DIRECTORY:INTERNAL=/Users/hans/MasterThesis/code/cpp/graph +CMAKE_HOME_DIRECTORY:INTERNAL=/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based //ADVANCED property for variable: CMAKE_INSTALL_NAME_TOOL CMAKE_INSTALL_NAME_TOOL-ADVANCED:INTERNAL=1 //ADVANCED property for variable: CMAKE_LINKER diff --git a/graph/build/CMakeFiles/2.8.12.2/CMakeCCompiler.cmake b/tree/build/CMakeFiles/2.8.12.2/CMakeCCompiler.cmake similarity index 100% rename from graph/build/CMakeFiles/2.8.12.2/CMakeCCompiler.cmake rename to tree/build/CMakeFiles/2.8.12.2/CMakeCCompiler.cmake diff --git a/graph/build/CMakeFiles/2.8.12.2/CMakeCXXCompiler.cmake b/tree/build/CMakeFiles/2.8.12.2/CMakeCXXCompiler.cmake similarity index 100% rename from graph/build/CMakeFiles/2.8.12.2/CMakeCXXCompiler.cmake rename to tree/build/CMakeFiles/2.8.12.2/CMakeCXXCompiler.cmake diff --git a/graph/build/CMakeFiles/2.8.12.2/CMakeDetermineCompilerABI_C.bin b/tree/build/CMakeFiles/2.8.12.2/CMakeDetermineCompilerABI_C.bin similarity index 100% rename from graph/build/CMakeFiles/2.8.12.2/CMakeDetermineCompilerABI_C.bin rename to tree/build/CMakeFiles/2.8.12.2/CMakeDetermineCompilerABI_C.bin diff --git a/graph/build/CMakeFiles/2.8.12.2/CMakeDetermineCompilerABI_CXX.bin b/tree/build/CMakeFiles/2.8.12.2/CMakeDetermineCompilerABI_CXX.bin similarity index 100% rename from graph/build/CMakeFiles/2.8.12.2/CMakeDetermineCompilerABI_CXX.bin rename to tree/build/CMakeFiles/2.8.12.2/CMakeDetermineCompilerABI_CXX.bin diff --git a/graph/build/CMakeFiles/2.8.12.2/CMakeSystem.cmake b/tree/build/CMakeFiles/2.8.12.2/CMakeSystem.cmake similarity index 100% rename from graph/build/CMakeFiles/2.8.12.2/CMakeSystem.cmake rename to tree/build/CMakeFiles/2.8.12.2/CMakeSystem.cmake diff --git a/graph/build/CMakeFiles/2.8.12.2/CompilerIdC/CMakeCCompilerId.c b/tree/build/CMakeFiles/2.8.12.2/CompilerIdC/CMakeCCompilerId.c similarity index 100% rename from graph/build/CMakeFiles/2.8.12.2/CompilerIdC/CMakeCCompilerId.c rename to tree/build/CMakeFiles/2.8.12.2/CompilerIdC/CMakeCCompilerId.c diff --git a/graph/build/CMakeFiles/2.8.12.2/CompilerIdC/a.out b/tree/build/CMakeFiles/2.8.12.2/CompilerIdC/a.out similarity index 100% rename from graph/build/CMakeFiles/2.8.12.2/CompilerIdC/a.out rename to tree/build/CMakeFiles/2.8.12.2/CompilerIdC/a.out diff --git a/graph/build/CMakeFiles/2.8.12.2/CompilerIdCXX/CMakeCXXCompilerId.cpp b/tree/build/CMakeFiles/2.8.12.2/CompilerIdCXX/CMakeCXXCompilerId.cpp similarity index 100% rename from graph/build/CMakeFiles/2.8.12.2/CompilerIdCXX/CMakeCXXCompilerId.cpp rename to tree/build/CMakeFiles/2.8.12.2/CompilerIdCXX/CMakeCXXCompilerId.cpp diff --git a/graph/build/CMakeFiles/2.8.12.2/CompilerIdCXX/a.out b/tree/build/CMakeFiles/2.8.12.2/CompilerIdCXX/a.out similarity index 100% rename from graph/build/CMakeFiles/2.8.12.2/CompilerIdCXX/a.out rename to tree/build/CMakeFiles/2.8.12.2/CompilerIdCXX/a.out diff --git a/graph/build/CMakeFiles/CMakeDirectoryInformation.cmake b/tree/build/CMakeFiles/CMakeDirectoryInformation.cmake similarity index 71% rename from graph/build/CMakeFiles/CMakeDirectoryInformation.cmake rename to tree/build/CMakeFiles/CMakeDirectoryInformation.cmake index db746d0..0c16429 100644 --- a/graph/build/CMakeFiles/CMakeDirectoryInformation.cmake +++ b/tree/build/CMakeFiles/CMakeDirectoryInformation.cmake @@ -2,8 +2,8 @@ # Generated by "Unix Makefiles" Generator, CMake Version 2.8 # Relative path conversion top directories. -SET(CMAKE_RELATIVE_PATH_TOP_SOURCE "/Users/hans/MasterThesis/code/cpp/graph") -SET(CMAKE_RELATIVE_PATH_TOP_BINARY "/Users/hans/MasterThesis/code/cpp/graph/build") +SET(CMAKE_RELATIVE_PATH_TOP_SOURCE "/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based") +SET(CMAKE_RELATIVE_PATH_TOP_BINARY "/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build") # Force unix paths in dependencies. SET(CMAKE_FORCE_UNIX_PATHS 1) diff --git a/graph/build/CMakeFiles/CMakeOutput.log b/tree/build/CMakeFiles/CMakeOutput.log similarity index 56% rename from graph/build/CMakeFiles/CMakeOutput.log rename to tree/build/CMakeFiles/CMakeOutput.log index ed448f7..061f509 100644 --- a/graph/build/CMakeFiles/CMakeOutput.log +++ b/tree/build/CMakeFiles/CMakeOutput.log @@ -10,7 +10,7 @@ The output was: Compilation of the C compiler identification source "CMakeCCompilerId.c" produced "a.out" -The C compiler identification is Clang, found in "/Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/2.8.12.2/CompilerIdC/a.out" +The C compiler identification is Clang, found in "/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/2.8.12.2/CompilerIdC/a.out" Compiling the CXX compiler identification source file "CMakeCXXCompilerId.cpp" succeeded. Compiler: /usr/bin/c++ @@ -23,36 +23,36 @@ The output was: Compilation of the CXX compiler identification source "CMakeCXXCompilerId.cpp" produced "a.out" -The CXX compiler identification is Clang, found in "/Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/2.8.12.2/CompilerIdCXX/a.out" +The CXX compiler identification is Clang, found in "/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/2.8.12.2/CompilerIdCXX/a.out" Determining if the C compiler works passed with the following output: -Change Dir: /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/CMakeTmp +Change Dir: /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/CMakeTmp -Run Build Command:/usr/bin/make "cmTryCompileExec1856954726/fast" -/Applications/Xcode.app/Contents/Developer/usr/bin/make -f CMakeFiles/cmTryCompileExec1856954726.dir/build.make CMakeFiles/cmTryCompileExec1856954726.dir/build -/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_progress_report /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/CMakeTmp/CMakeFiles 1 -Building C object CMakeFiles/cmTryCompileExec1856954726.dir/testCCompiler.c.o -/usr/bin/cc -o CMakeFiles/cmTryCompileExec1856954726.dir/testCCompiler.c.o -c /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/CMakeTmp/testCCompiler.c -Linking C executable cmTryCompileExec1856954726 -/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec1856954726.dir/link.txt --verbose=1 -/usr/bin/cc -Wl,-search_paths_first -Wl,-headerpad_max_install_names CMakeFiles/cmTryCompileExec1856954726.dir/testCCompiler.c.o -o cmTryCompileExec1856954726 +Run Build Command:/usr/bin/make "cmTryCompileExec2693135603/fast" +/Applications/Xcode.app/Contents/Developer/usr/bin/make -f CMakeFiles/cmTryCompileExec2693135603.dir/build.make CMakeFiles/cmTryCompileExec2693135603.dir/build +/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_progress_report /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/CMakeTmp/CMakeFiles 1 +Building C object CMakeFiles/cmTryCompileExec2693135603.dir/testCCompiler.c.o +/usr/bin/cc -o CMakeFiles/cmTryCompileExec2693135603.dir/testCCompiler.c.o -c /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/CMakeTmp/testCCompiler.c +Linking C executable cmTryCompileExec2693135603 +/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec2693135603.dir/link.txt --verbose=1 +/usr/bin/cc -Wl,-search_paths_first -Wl,-headerpad_max_install_names CMakeFiles/cmTryCompileExec2693135603.dir/testCCompiler.c.o -o cmTryCompileExec2693135603 Detecting C compiler ABI info compiled with the following output: -Change Dir: /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/CMakeTmp - -Run Build Command:/usr/bin/make "cmTryCompileExec3562048807/fast" -/Applications/Xcode.app/Contents/Developer/usr/bin/make -f CMakeFiles/cmTryCompileExec3562048807.dir/build.make CMakeFiles/cmTryCompileExec3562048807.dir/build -/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_progress_report /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/CMakeTmp/CMakeFiles 1 -Building C object CMakeFiles/cmTryCompileExec3562048807.dir/CMakeCCompilerABI.c.o -/usr/bin/cc -o CMakeFiles/cmTryCompileExec3562048807.dir/CMakeCCompilerABI.c.o -c /usr/local/Cellar/cmake/2.8.12.2/share/cmake/Modules/CMakeCCompilerABI.c -Linking C executable cmTryCompileExec3562048807 -/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec3562048807.dir/link.txt --verbose=1 -/usr/bin/cc -Wl,-search_paths_first -Wl,-headerpad_max_install_names -v -Wl,-v CMakeFiles/cmTryCompileExec3562048807.dir/CMakeCCompilerABI.c.o -o cmTryCompileExec3562048807 +Change Dir: /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/CMakeTmp + +Run Build Command:/usr/bin/make "cmTryCompileExec1585390307/fast" +/Applications/Xcode.app/Contents/Developer/usr/bin/make -f CMakeFiles/cmTryCompileExec1585390307.dir/build.make CMakeFiles/cmTryCompileExec1585390307.dir/build +/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_progress_report /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/CMakeTmp/CMakeFiles 1 +Building C object CMakeFiles/cmTryCompileExec1585390307.dir/CMakeCCompilerABI.c.o +/usr/bin/cc -o CMakeFiles/cmTryCompileExec1585390307.dir/CMakeCCompilerABI.c.o -c /usr/local/Cellar/cmake/2.8.12.2/share/cmake/Modules/CMakeCCompilerABI.c +Linking C executable cmTryCompileExec1585390307 +/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec1585390307.dir/link.txt --verbose=1 +/usr/bin/cc -Wl,-search_paths_first -Wl,-headerpad_max_install_names -v -Wl,-v CMakeFiles/cmTryCompileExec1585390307.dir/CMakeCCompilerABI.c.o -o cmTryCompileExec1585390307 Apple LLVM version 5.1 (clang-503.0.40) (based on LLVM 3.4svn) Target: x86_64-apple-darwin13.1.0 Thread model: posix - "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld" -demangle -dynamic -arch x86_64 -macosx_version_min 10.9.0 -o cmTryCompileExec3562048807 -search_paths_first -headerpad_max_install_names -v CMakeFiles/cmTryCompileExec3562048807.dir/CMakeCCompilerABI.c.o -lSystem /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/lib/darwin/libclang_rt.osx.a + "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld" -demangle -dynamic -arch x86_64 -macosx_version_min 10.9.0 -o cmTryCompileExec1585390307 -search_paths_first -headerpad_max_install_names -v CMakeFiles/cmTryCompileExec1585390307.dir/CMakeCCompilerABI.c.o -lSystem /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/lib/darwin/libclang_rt.osx.a @(#)PROGRAM:ld PROJECT:ld64-236.4 configured to support archs: armv6 armv7 armv7s arm64 i386 x86_64 armv6m armv7m armv7em Library search paths: @@ -65,20 +65,20 @@ Framework search paths: Parsed C implicit link information from above output: link line regex: [^( *|.*[/\])(ld|([^/\]+-)?ld|collect2)[^/\]*( |$)] - ignore line: [Change Dir: /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/CMakeTmp] + ignore line: [Change Dir: /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/CMakeTmp] ignore line: [] - ignore line: [Run Build Command:/usr/bin/make "cmTryCompileExec3562048807/fast"] - ignore line: [/Applications/Xcode.app/Contents/Developer/usr/bin/make -f CMakeFiles/cmTryCompileExec3562048807.dir/build.make CMakeFiles/cmTryCompileExec3562048807.dir/build] - ignore line: [/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_progress_report /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/CMakeTmp/CMakeFiles 1] - ignore line: [Building C object CMakeFiles/cmTryCompileExec3562048807.dir/CMakeCCompilerABI.c.o] - ignore line: [/usr/bin/cc -o CMakeFiles/cmTryCompileExec3562048807.dir/CMakeCCompilerABI.c.o -c /usr/local/Cellar/cmake/2.8.12.2/share/cmake/Modules/CMakeCCompilerABI.c] - ignore line: [Linking C executable cmTryCompileExec3562048807] - ignore line: [/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec3562048807.dir/link.txt --verbose=1] - ignore line: [/usr/bin/cc -Wl,-search_paths_first -Wl,-headerpad_max_install_names -v -Wl,-v CMakeFiles/cmTryCompileExec3562048807.dir/CMakeCCompilerABI.c.o -o cmTryCompileExec3562048807 ] + ignore line: [Run Build Command:/usr/bin/make "cmTryCompileExec1585390307/fast"] + ignore line: [/Applications/Xcode.app/Contents/Developer/usr/bin/make -f CMakeFiles/cmTryCompileExec1585390307.dir/build.make CMakeFiles/cmTryCompileExec1585390307.dir/build] + ignore line: [/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_progress_report /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/CMakeTmp/CMakeFiles 1] + ignore line: [Building C object CMakeFiles/cmTryCompileExec1585390307.dir/CMakeCCompilerABI.c.o] + ignore line: [/usr/bin/cc -o CMakeFiles/cmTryCompileExec1585390307.dir/CMakeCCompilerABI.c.o -c /usr/local/Cellar/cmake/2.8.12.2/share/cmake/Modules/CMakeCCompilerABI.c] + ignore line: [Linking C executable cmTryCompileExec1585390307] + ignore line: [/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec1585390307.dir/link.txt --verbose=1] + ignore line: [/usr/bin/cc -Wl,-search_paths_first -Wl,-headerpad_max_install_names -v -Wl,-v CMakeFiles/cmTryCompileExec1585390307.dir/CMakeCCompilerABI.c.o -o cmTryCompileExec1585390307 ] ignore line: [Apple LLVM version 5.1 (clang-503.0.40) (based on LLVM 3.4svn)] ignore line: [Target: x86_64-apple-darwin13.1.0] ignore line: [Thread model: posix] - link line: [ "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld" -demangle -dynamic -arch x86_64 -macosx_version_min 10.9.0 -o cmTryCompileExec3562048807 -search_paths_first -headerpad_max_install_names -v CMakeFiles/cmTryCompileExec3562048807.dir/CMakeCCompilerABI.c.o -lSystem /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/lib/darwin/libclang_rt.osx.a] + link line: [ "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld" -demangle -dynamic -arch x86_64 -macosx_version_min 10.9.0 -o cmTryCompileExec1585390307 -search_paths_first -headerpad_max_install_names -v CMakeFiles/cmTryCompileExec1585390307.dir/CMakeCCompilerABI.c.o -lSystem /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/lib/darwin/libclang_rt.osx.a] arg [/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld] ==> ignore arg [-demangle] ==> ignore arg [-dynamic] ==> ignore @@ -87,11 +87,11 @@ Parsed C implicit link information from above output: arg [-macosx_version_min] ==> ignore arg [10.9.0] ==> ignore arg [-o] ==> ignore - arg [cmTryCompileExec3562048807] ==> ignore + arg [cmTryCompileExec1585390307] ==> ignore arg [-search_paths_first] ==> ignore arg [-headerpad_max_install_names] ==> ignore arg [-v] ==> ignore - arg [CMakeFiles/cmTryCompileExec3562048807.dir/CMakeCCompilerABI.c.o] ==> ignore + arg [CMakeFiles/cmTryCompileExec1585390307.dir/CMakeCCompilerABI.c.o] ==> ignore arg [-lSystem] ==> lib [System] arg [/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/lib/darwin/libclang_rt.osx.a] ==> lib [/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/lib/darwin/libclang_rt.osx.a] Library search paths: [;/usr/lib;/usr/local/lib] @@ -108,33 +108,33 @@ Parsed C implicit link information from above output: Determining if the CXX compiler works passed with the following output: -Change Dir: /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/CMakeTmp +Change Dir: /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/CMakeTmp -Run Build Command:/usr/bin/make "cmTryCompileExec2361940291/fast" -/Applications/Xcode.app/Contents/Developer/usr/bin/make -f CMakeFiles/cmTryCompileExec2361940291.dir/build.make CMakeFiles/cmTryCompileExec2361940291.dir/build -/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_progress_report /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/CMakeTmp/CMakeFiles 1 -Building CXX object CMakeFiles/cmTryCompileExec2361940291.dir/testCXXCompiler.cxx.o -/usr/bin/c++ -o CMakeFiles/cmTryCompileExec2361940291.dir/testCXXCompiler.cxx.o -c /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/CMakeTmp/testCXXCompiler.cxx -Linking CXX executable cmTryCompileExec2361940291 -/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec2361940291.dir/link.txt --verbose=1 -/usr/bin/c++ -Wl,-search_paths_first -Wl,-headerpad_max_install_names CMakeFiles/cmTryCompileExec2361940291.dir/testCXXCompiler.cxx.o -o cmTryCompileExec2361940291 +Run Build Command:/usr/bin/make "cmTryCompileExec3440345175/fast" +/Applications/Xcode.app/Contents/Developer/usr/bin/make -f CMakeFiles/cmTryCompileExec3440345175.dir/build.make CMakeFiles/cmTryCompileExec3440345175.dir/build +/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_progress_report /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/CMakeTmp/CMakeFiles 1 +Building CXX object CMakeFiles/cmTryCompileExec3440345175.dir/testCXXCompiler.cxx.o +/usr/bin/c++ -o CMakeFiles/cmTryCompileExec3440345175.dir/testCXXCompiler.cxx.o -c /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/CMakeTmp/testCXXCompiler.cxx +Linking CXX executable cmTryCompileExec3440345175 +/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec3440345175.dir/link.txt --verbose=1 +/usr/bin/c++ -Wl,-search_paths_first -Wl,-headerpad_max_install_names CMakeFiles/cmTryCompileExec3440345175.dir/testCXXCompiler.cxx.o -o cmTryCompileExec3440345175 Detecting CXX compiler ABI info compiled with the following output: -Change Dir: /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/CMakeTmp - -Run Build Command:/usr/bin/make "cmTryCompileExec917051739/fast" -/Applications/Xcode.app/Contents/Developer/usr/bin/make -f CMakeFiles/cmTryCompileExec917051739.dir/build.make CMakeFiles/cmTryCompileExec917051739.dir/build -/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_progress_report /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/CMakeTmp/CMakeFiles 1 -Building CXX object CMakeFiles/cmTryCompileExec917051739.dir/CMakeCXXCompilerABI.cpp.o -/usr/bin/c++ -o CMakeFiles/cmTryCompileExec917051739.dir/CMakeCXXCompilerABI.cpp.o -c /usr/local/Cellar/cmake/2.8.12.2/share/cmake/Modules/CMakeCXXCompilerABI.cpp -Linking CXX executable cmTryCompileExec917051739 -/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec917051739.dir/link.txt --verbose=1 -/usr/bin/c++ -Wl,-search_paths_first -Wl,-headerpad_max_install_names -v -Wl,-v CMakeFiles/cmTryCompileExec917051739.dir/CMakeCXXCompilerABI.cpp.o -o cmTryCompileExec917051739 +Change Dir: /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/CMakeTmp + +Run Build Command:/usr/bin/make "cmTryCompileExec3741707336/fast" +/Applications/Xcode.app/Contents/Developer/usr/bin/make -f CMakeFiles/cmTryCompileExec3741707336.dir/build.make CMakeFiles/cmTryCompileExec3741707336.dir/build +/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_progress_report /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/CMakeTmp/CMakeFiles 1 +Building CXX object CMakeFiles/cmTryCompileExec3741707336.dir/CMakeCXXCompilerABI.cpp.o +/usr/bin/c++ -o CMakeFiles/cmTryCompileExec3741707336.dir/CMakeCXXCompilerABI.cpp.o -c /usr/local/Cellar/cmake/2.8.12.2/share/cmake/Modules/CMakeCXXCompilerABI.cpp +Linking CXX executable cmTryCompileExec3741707336 +/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec3741707336.dir/link.txt --verbose=1 +/usr/bin/c++ -Wl,-search_paths_first -Wl,-headerpad_max_install_names -v -Wl,-v CMakeFiles/cmTryCompileExec3741707336.dir/CMakeCXXCompilerABI.cpp.o -o cmTryCompileExec3741707336 Apple LLVM version 5.1 (clang-503.0.40) (based on LLVM 3.4svn) Target: x86_64-apple-darwin13.1.0 Thread model: posix - "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld" -demangle -dynamic -arch x86_64 -macosx_version_min 10.9.0 -o cmTryCompileExec917051739 -search_paths_first -headerpad_max_install_names -v CMakeFiles/cmTryCompileExec917051739.dir/CMakeCXXCompilerABI.cpp.o -lc++ -lSystem /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/lib/darwin/libclang_rt.osx.a + "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld" -demangle -dynamic -arch x86_64 -macosx_version_min 10.9.0 -o cmTryCompileExec3741707336 -search_paths_first -headerpad_max_install_names -v CMakeFiles/cmTryCompileExec3741707336.dir/CMakeCXXCompilerABI.cpp.o -lc++ -lSystem /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/lib/darwin/libclang_rt.osx.a @(#)PROGRAM:ld PROJECT:ld64-236.4 configured to support archs: armv6 armv7 armv7s arm64 i386 x86_64 armv6m armv7m armv7em Library search paths: @@ -147,20 +147,20 @@ Framework search paths: Parsed CXX implicit link information from above output: link line regex: [^( *|.*[/\])(ld|([^/\]+-)?ld|collect2)[^/\]*( |$)] - ignore line: [Change Dir: /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/CMakeTmp] + ignore line: [Change Dir: /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/CMakeTmp] ignore line: [] - ignore line: [Run Build Command:/usr/bin/make "cmTryCompileExec917051739/fast"] - ignore line: [/Applications/Xcode.app/Contents/Developer/usr/bin/make -f CMakeFiles/cmTryCompileExec917051739.dir/build.make CMakeFiles/cmTryCompileExec917051739.dir/build] - ignore line: [/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_progress_report /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/CMakeTmp/CMakeFiles 1] - ignore line: [Building CXX object CMakeFiles/cmTryCompileExec917051739.dir/CMakeCXXCompilerABI.cpp.o] - ignore line: [/usr/bin/c++ -o CMakeFiles/cmTryCompileExec917051739.dir/CMakeCXXCompilerABI.cpp.o -c /usr/local/Cellar/cmake/2.8.12.2/share/cmake/Modules/CMakeCXXCompilerABI.cpp] - ignore line: [Linking CXX executable cmTryCompileExec917051739] - ignore line: [/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec917051739.dir/link.txt --verbose=1] - ignore line: [/usr/bin/c++ -Wl,-search_paths_first -Wl,-headerpad_max_install_names -v -Wl,-v CMakeFiles/cmTryCompileExec917051739.dir/CMakeCXXCompilerABI.cpp.o -o cmTryCompileExec917051739 ] + ignore line: [Run Build Command:/usr/bin/make "cmTryCompileExec3741707336/fast"] + ignore line: [/Applications/Xcode.app/Contents/Developer/usr/bin/make -f CMakeFiles/cmTryCompileExec3741707336.dir/build.make CMakeFiles/cmTryCompileExec3741707336.dir/build] + ignore line: [/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_progress_report /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/CMakeTmp/CMakeFiles 1] + ignore line: [Building CXX object CMakeFiles/cmTryCompileExec3741707336.dir/CMakeCXXCompilerABI.cpp.o] + ignore line: [/usr/bin/c++ -o CMakeFiles/cmTryCompileExec3741707336.dir/CMakeCXXCompilerABI.cpp.o -c /usr/local/Cellar/cmake/2.8.12.2/share/cmake/Modules/CMakeCXXCompilerABI.cpp] + ignore line: [Linking CXX executable cmTryCompileExec3741707336] + ignore line: [/usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E cmake_link_script CMakeFiles/cmTryCompileExec3741707336.dir/link.txt --verbose=1] + ignore line: [/usr/bin/c++ -Wl,-search_paths_first -Wl,-headerpad_max_install_names -v -Wl,-v CMakeFiles/cmTryCompileExec3741707336.dir/CMakeCXXCompilerABI.cpp.o -o cmTryCompileExec3741707336 ] ignore line: [Apple LLVM version 5.1 (clang-503.0.40) (based on LLVM 3.4svn)] ignore line: [Target: x86_64-apple-darwin13.1.0] ignore line: [Thread model: posix] - link line: [ "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld" -demangle -dynamic -arch x86_64 -macosx_version_min 10.9.0 -o cmTryCompileExec917051739 -search_paths_first -headerpad_max_install_names -v CMakeFiles/cmTryCompileExec917051739.dir/CMakeCXXCompilerABI.cpp.o -lc++ -lSystem /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/lib/darwin/libclang_rt.osx.a] + link line: [ "/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld" -demangle -dynamic -arch x86_64 -macosx_version_min 10.9.0 -o cmTryCompileExec3741707336 -search_paths_first -headerpad_max_install_names -v CMakeFiles/cmTryCompileExec3741707336.dir/CMakeCXXCompilerABI.cpp.o -lc++ -lSystem /Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/lib/darwin/libclang_rt.osx.a] arg [/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/ld] ==> ignore arg [-demangle] ==> ignore arg [-dynamic] ==> ignore @@ -169,11 +169,11 @@ Parsed CXX implicit link information from above output: arg [-macosx_version_min] ==> ignore arg [10.9.0] ==> ignore arg [-o] ==> ignore - arg [cmTryCompileExec917051739] ==> ignore + arg [cmTryCompileExec3741707336] ==> ignore arg [-search_paths_first] ==> ignore arg [-headerpad_max_install_names] ==> ignore arg [-v] ==> ignore - arg [CMakeFiles/cmTryCompileExec917051739.dir/CMakeCXXCompilerABI.cpp.o] ==> ignore + arg [CMakeFiles/cmTryCompileExec3741707336.dir/CMakeCXXCompilerABI.cpp.o] ==> ignore arg [-lc++] ==> lib [c++] arg [-lSystem] ==> lib [System] arg [/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/lib/darwin/libclang_rt.osx.a] ==> lib [/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/bin/../lib/clang/5.1/lib/darwin/libclang_rt.osx.a] diff --git a/graph/build/CMakeFiles/Makefile.cmake b/tree/build/CMakeFiles/Makefile.cmake similarity index 96% rename from graph/build/CMakeFiles/Makefile.cmake rename to tree/build/CMakeFiles/Makefile.cmake index c238a81..1fc4b46 100644 --- a/graph/build/CMakeFiles/Makefile.cmake +++ b/tree/build/CMakeFiles/Makefile.cmake @@ -53,6 +53,6 @@ SET(CMAKE_MAKEFILE_PRODUCTS # Dependency information for all targets: SET(CMAKE_DEPEND_INFO_FILES - "CMakeFiles/segment.dir/DependInfo.cmake" - "CMakeFiles/segment_felz.dir/DependInfo.cmake" + "CMakeFiles/seg_tree.dir/DependInfo.cmake" + "CMakeFiles/segmentation_tree.dir/DependInfo.cmake" ) diff --git a/tree/build/CMakeFiles/Makefile2 b/tree/build/CMakeFiles/Makefile2 new file mode 100644 index 0000000..1e43962 --- /dev/null +++ b/tree/build/CMakeFiles/Makefile2 @@ -0,0 +1,137 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 2.8 + +# Default target executed when no arguments are given to make. +default_target: all +.PHONY : default_target + +# The main recursive all target +all: +.PHONY : all + +# The main recursive preinstall target +preinstall: +.PHONY : preinstall + +#============================================================================= +# 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 = /usr/local/Cellar/cmake/2.8.12.2/bin/cmake + +# The command to remove a file. +RM = /usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E remove -f + +# Escaping for special characters. +EQUALS = = + +# The program to use to edit the cache. +CMAKE_EDIT_COMMAND = /usr/local/Cellar/cmake/2.8.12.2/bin/ccmake + +# The top-level source directory on which CMake was run. +CMAKE_SOURCE_DIR = /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build + +#============================================================================= +# Target rules for target CMakeFiles/seg_tree.dir + +# All Build rule for target. +CMakeFiles/seg_tree.dir/all: + $(MAKE) -f CMakeFiles/seg_tree.dir/build.make CMakeFiles/seg_tree.dir/depend + $(MAKE) -f CMakeFiles/seg_tree.dir/build.make CMakeFiles/seg_tree.dir/build + $(CMAKE_COMMAND) -E cmake_progress_report /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles 1 + @echo "Built target seg_tree" +.PHONY : CMakeFiles/seg_tree.dir/all + +# Include target in all. +all: CMakeFiles/seg_tree.dir/all +.PHONY : all + +# Build rule for subdir invocation for target. +CMakeFiles/seg_tree.dir/rule: cmake_check_build_system + $(CMAKE_COMMAND) -E cmake_progress_start /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles 1 + $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/seg_tree.dir/all + $(CMAKE_COMMAND) -E cmake_progress_start /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles 0 +.PHONY : CMakeFiles/seg_tree.dir/rule + +# Convenience name for target. +seg_tree: CMakeFiles/seg_tree.dir/rule +.PHONY : seg_tree + +# clean rule for target. +CMakeFiles/seg_tree.dir/clean: + $(MAKE) -f CMakeFiles/seg_tree.dir/build.make CMakeFiles/seg_tree.dir/clean +.PHONY : CMakeFiles/seg_tree.dir/clean + +# clean rule for target. +clean: CMakeFiles/seg_tree.dir/clean +.PHONY : clean + +#============================================================================= +# Target rules for target CMakeFiles/segmentation_tree.dir + +# All Build rule for target. +CMakeFiles/segmentation_tree.dir/all: + $(MAKE) -f CMakeFiles/segmentation_tree.dir/build.make CMakeFiles/segmentation_tree.dir/depend + $(MAKE) -f CMakeFiles/segmentation_tree.dir/build.make CMakeFiles/segmentation_tree.dir/build + $(CMAKE_COMMAND) -E cmake_progress_report /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles 2 + @echo "Built target segmentation_tree" +.PHONY : CMakeFiles/segmentation_tree.dir/all + +# Include target in all. +all: CMakeFiles/segmentation_tree.dir/all +.PHONY : all + +# Build rule for subdir invocation for target. +CMakeFiles/segmentation_tree.dir/rule: cmake_check_build_system + $(CMAKE_COMMAND) -E cmake_progress_start /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles 1 + $(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/segmentation_tree.dir/all + $(CMAKE_COMMAND) -E cmake_progress_start /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles 0 +.PHONY : CMakeFiles/segmentation_tree.dir/rule + +# Convenience name for target. +segmentation_tree: CMakeFiles/segmentation_tree.dir/rule +.PHONY : segmentation_tree + +# clean rule for target. +CMakeFiles/segmentation_tree.dir/clean: + $(MAKE) -f CMakeFiles/segmentation_tree.dir/build.make CMakeFiles/segmentation_tree.dir/clean +.PHONY : CMakeFiles/segmentation_tree.dir/clean + +# clean rule for target. +clean: CMakeFiles/segmentation_tree.dir/clean +.PHONY : clean + +#============================================================================= +# 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: + $(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0 +.PHONY : cmake_check_build_system + diff --git a/tree/build/CMakeFiles/TargetDirectories.txt b/tree/build/CMakeFiles/TargetDirectories.txt new file mode 100644 index 0000000..962d8af --- /dev/null +++ b/tree/build/CMakeFiles/TargetDirectories.txt @@ -0,0 +1,2 @@ +/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/seg_tree.dir +/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/segmentation_tree.dir diff --git a/graph/build/CMakeFiles/cmake.check_cache b/tree/build/CMakeFiles/cmake.check_cache similarity index 100% rename from graph/build/CMakeFiles/cmake.check_cache rename to tree/build/CMakeFiles/cmake.check_cache diff --git a/graph/build/CMakeFiles/progress.marks b/tree/build/CMakeFiles/progress.marks similarity index 100% rename from graph/build/CMakeFiles/progress.marks rename to tree/build/CMakeFiles/progress.marks diff --git a/graph/build/CMakeFiles/segment.dir/CXX.includecache b/tree/build/CMakeFiles/seg_tree.dir/CXX.includecache similarity index 94% rename from graph/build/CMakeFiles/segment.dir/CXX.includecache rename to tree/build/CMakeFiles/seg_tree.dir/CXX.includecache index c7eb796..4de16ce 100644 --- a/graph/build/CMakeFiles/segment.dir/CXX.includecache +++ b/tree/build/CMakeFiles/seg_tree.dir/CXX.includecache @@ -398,7 +398,7 @@ wctype.h /System/Library/Frameworks/Python.framework/Headers/weakrefobject.h -/Users/hans/MasterThesis/code/cpp/graph/src/CVBoostConverter.hpp +/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/CVBoostConverter.hpp Python.h - numpy/ndarrayobject.h @@ -412,37 +412,17 @@ boost/python.hpp cstdio - -/Users/hans/MasterThesis/code/cpp/graph/src/cluster.h +/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/edge.h -/Users/hans/MasterThesis/code/cpp/graph/src/edge.h - -/Users/hans/MasterThesis/code/cpp/graph/src/segment-graph.h -edge.h -/Users/hans/MasterThesis/code/cpp/graph/src/edge.h -cluster.h -/Users/hans/MasterThesis/code/cpp/graph/src/cluster.h - -/Users/hans/MasterThesis/code/cpp/graph/src/segment-image.h -segment-graph.h -/Users/hans/MasterThesis/code/cpp/graph/src/segment-graph.h -map -- - -/Users/hans/MasterThesis/code/cpp/graph/src/segment.cpp -opencv2/core/core.hpp -- -opencv2/imgproc/imgproc.hpp -- -opencv2/highgui/highgui.hpp -- -iostream -- -segment-image.h -/Users/hans/MasterThesis/code/cpp/graph/src/segment-image.h -ctime -- +/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/tree.cpp CVBoostConverter.hpp -/Users/hans/MasterThesis/code/cpp/graph/src/CVBoostConverter.hpp +/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/CVBoostConverter.hpp boost/python.hpp - +opencv2/opencv.hpp +- +unordered_map +- +edge.h +/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/edge.h diff --git a/graph/build/CMakeFiles/segment.dir/DependInfo.cmake b/tree/build/CMakeFiles/seg_tree.dir/DependInfo.cmake similarity index 80% rename from graph/build/CMakeFiles/segment.dir/DependInfo.cmake rename to tree/build/CMakeFiles/seg_tree.dir/DependInfo.cmake index 402fc5d..bfc3894 100644 --- a/graph/build/CMakeFiles/segment.dir/DependInfo.cmake +++ b/tree/build/CMakeFiles/seg_tree.dir/DependInfo.cmake @@ -4,7 +4,7 @@ SET(CMAKE_DEPENDS_LANGUAGES ) # The set of files for implicit dependencies of each language: SET(CMAKE_DEPENDS_CHECK_CXX - "/Users/hans/MasterThesis/code/cpp/graph/src/segment.cpp" "/Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/segment.dir/src/segment.cpp.o" + "/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/tree.cpp" "/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/seg_tree.dir/src/tree.cpp.o" ) SET(CMAKE_CXX_COMPILER_ID "Clang") diff --git a/tree/build/CMakeFiles/seg_tree.dir/build.make b/tree/build/CMakeFiles/seg_tree.dir/build.make new file mode 100644 index 0000000..27bca8d --- /dev/null +++ b/tree/build/CMakeFiles/seg_tree.dir/build.make @@ -0,0 +1,152 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 2.8 + +#============================================================================= +# 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 = /usr/local/Cellar/cmake/2.8.12.2/bin/cmake + +# The command to remove a file. +RM = /usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E remove -f + +# Escaping for special characters. +EQUALS = = + +# The program to use to edit the cache. +CMAKE_EDIT_COMMAND = /usr/local/Cellar/cmake/2.8.12.2/bin/ccmake + +# The top-level source directory on which CMake was run. +CMAKE_SOURCE_DIR = /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build + +# Include any dependencies generated for this target. +include CMakeFiles/seg_tree.dir/depend.make + +# Include the progress variables for this target. +include CMakeFiles/seg_tree.dir/progress.make + +# Include the compile flags for this target's objects. +include CMakeFiles/seg_tree.dir/flags.make + +CMakeFiles/seg_tree.dir/src/tree.cpp.o: CMakeFiles/seg_tree.dir/flags.make +CMakeFiles/seg_tree.dir/src/tree.cpp.o: ../src/tree.cpp + $(CMAKE_COMMAND) -E cmake_progress_report /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles $(CMAKE_PROGRESS_1) + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Building CXX object CMakeFiles/seg_tree.dir/src/tree.cpp.o" + /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -o CMakeFiles/seg_tree.dir/src/tree.cpp.o -c /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/tree.cpp + +CMakeFiles/seg_tree.dir/src/tree.cpp.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/seg_tree.dir/src/tree.cpp.i" + /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -E /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/tree.cpp > CMakeFiles/seg_tree.dir/src/tree.cpp.i + +CMakeFiles/seg_tree.dir/src/tree.cpp.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/seg_tree.dir/src/tree.cpp.s" + /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -S /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/tree.cpp -o CMakeFiles/seg_tree.dir/src/tree.cpp.s + +CMakeFiles/seg_tree.dir/src/tree.cpp.o.requires: +.PHONY : CMakeFiles/seg_tree.dir/src/tree.cpp.o.requires + +CMakeFiles/seg_tree.dir/src/tree.cpp.o.provides: CMakeFiles/seg_tree.dir/src/tree.cpp.o.requires + $(MAKE) -f CMakeFiles/seg_tree.dir/build.make CMakeFiles/seg_tree.dir/src/tree.cpp.o.provides.build +.PHONY : CMakeFiles/seg_tree.dir/src/tree.cpp.o.provides + +CMakeFiles/seg_tree.dir/src/tree.cpp.o.provides.build: CMakeFiles/seg_tree.dir/src/tree.cpp.o + +# Object files for target seg_tree +seg_tree_OBJECTS = \ +"CMakeFiles/seg_tree.dir/src/tree.cpp.o" + +# External object files for target seg_tree +seg_tree_EXTERNAL_OBJECTS = + +seg_tree: CMakeFiles/seg_tree.dir/src/tree.cpp.o +seg_tree: CMakeFiles/seg_tree.dir/build.make +seg_tree: /usr/local/lib/libboost_python-mt.a +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_viz.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_videostab.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_video.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_ts.a +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_superres.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_stitching.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_softcascade.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_shape.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_photo.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_optim.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_objdetect.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_nonfree.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_ml.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_legacy.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_imgproc.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_highgui.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_flann.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_features2d.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_cudawarping.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_cudastereo.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_cudaoptflow.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_cudaimgproc.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_cudafilters.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_cudafeatures2d.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_cudabgsegm.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_cudaarithm.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_cuda.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_core.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_contrib.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_calib3d.3.0.0.dylib +seg_tree: /usr/lib/libpython2.7.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_cudawarping.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_legacy.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_cudaimgproc.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_cudafilters.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_video.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_objdetect.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_nonfree.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_ml.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_cudaarithm.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_calib3d.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_features2d.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_highgui.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_imgproc.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_flann.3.0.0.dylib +seg_tree: /opt/ros/hydro/install_isolated/lib/libopencv_core.3.0.0.dylib +seg_tree: CMakeFiles/seg_tree.dir/link.txt + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --red --bold "Linking CXX executable seg_tree" + $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/seg_tree.dir/link.txt --verbose=$(VERBOSE) + +# Rule to build all files generated by this target. +CMakeFiles/seg_tree.dir/build: seg_tree +.PHONY : CMakeFiles/seg_tree.dir/build + +CMakeFiles/seg_tree.dir/requires: CMakeFiles/seg_tree.dir/src/tree.cpp.o.requires +.PHONY : CMakeFiles/seg_tree.dir/requires + +CMakeFiles/seg_tree.dir/clean: + $(CMAKE_COMMAND) -P CMakeFiles/seg_tree.dir/cmake_clean.cmake +.PHONY : CMakeFiles/seg_tree.dir/clean + +CMakeFiles/seg_tree.dir/depend: + cd /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/seg_tree.dir/DependInfo.cmake --color=$(COLOR) +.PHONY : CMakeFiles/seg_tree.dir/depend + diff --git a/tree/build/CMakeFiles/seg_tree.dir/cmake_clean.cmake b/tree/build/CMakeFiles/seg_tree.dir/cmake_clean.cmake new file mode 100644 index 0000000..877a3a5 --- /dev/null +++ b/tree/build/CMakeFiles/seg_tree.dir/cmake_clean.cmake @@ -0,0 +1,10 @@ +FILE(REMOVE_RECURSE + "CMakeFiles/seg_tree.dir/src/tree.cpp.o" + "seg_tree.pdb" + "seg_tree" +) + +# Per-language clean rules from dependency scanning. +FOREACH(lang CXX) + INCLUDE(CMakeFiles/seg_tree.dir/cmake_clean_${lang}.cmake OPTIONAL) +ENDFOREACH(lang) diff --git a/graph/build/CMakeFiles/segment.dir/depend.internal b/tree/build/CMakeFiles/seg_tree.dir/depend.internal similarity index 93% rename from graph/build/CMakeFiles/segment.dir/depend.internal rename to tree/build/CMakeFiles/seg_tree.dir/depend.internal index 8e914e7..29f5f1c 100644 --- a/graph/build/CMakeFiles/segment.dir/depend.internal +++ b/tree/build/CMakeFiles/seg_tree.dir/depend.internal @@ -1,7 +1,7 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 2.8 -CMakeFiles/segment.dir/src/segment.cpp.o +CMakeFiles/seg_tree.dir/src/tree.cpp.o /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/__multiarray_api.h /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/_neighborhood_iterator_imp.h /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/_numpyconfig.h @@ -75,9 +75,6 @@ CMakeFiles/segment.dir/src/segment.cpp.o /System/Library/Frameworks/Python.framework/Headers/unicodeobject.h /System/Library/Frameworks/Python.framework/Headers/warnings.h /System/Library/Frameworks/Python.framework/Headers/weakrefobject.h - /Users/hans/MasterThesis/code/cpp/graph/src/CVBoostConverter.hpp - /Users/hans/MasterThesis/code/cpp/graph/src/cluster.h - /Users/hans/MasterThesis/code/cpp/graph/src/edge.h - /Users/hans/MasterThesis/code/cpp/graph/src/segment-graph.h - /Users/hans/MasterThesis/code/cpp/graph/src/segment-image.h - /Users/hans/MasterThesis/code/cpp/graph/src/segment.cpp + /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/CVBoostConverter.hpp + /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/edge.h + /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/tree.cpp diff --git a/tree/build/CMakeFiles/seg_tree.dir/depend.make b/tree/build/CMakeFiles/seg_tree.dir/depend.make new file mode 100644 index 0000000..72e8bb6 --- /dev/null +++ b/tree/build/CMakeFiles/seg_tree.dir/depend.make @@ -0,0 +1,80 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 2.8 + +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/__multiarray_api.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/_neighborhood_iterator_imp.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/_numpyconfig.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/ndarrayobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/ndarraytypes.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/npy_1_7_deprecated_api.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/npy_common.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/npy_cpu.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/npy_endian.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/numpyconfig.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/old_defines.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/utils.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/Python.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/abstract.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/boolobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/bufferobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/bytearrayobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/bytesobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/cellobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/ceval.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/classobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/cobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/code.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/codecs.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/compile.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/complexobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/descrobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/dictobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/dtoa.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/enumobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/eval.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/fileobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/floatobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/funcobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/genobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/import.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/intobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/intrcheck.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/iterobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/listobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/longobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/memoryobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/methodobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/modsupport.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/moduleobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/object.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/objimpl.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/patchlevel.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyarena.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pycapsule.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyconfig.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyctype.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pydebug.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyerrors.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyfpe.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pymacconfig.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pymath.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pymem.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyport.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pystate.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pystrcmp.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pystrtod.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pythonrun.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/rangeobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/setobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/sliceobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/stringobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/sysmodule.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/traceback.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/tupleobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/unicodeobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/warnings.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/weakrefobject.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: ../src/CVBoostConverter.hpp +CMakeFiles/seg_tree.dir/src/tree.cpp.o: ../src/edge.h +CMakeFiles/seg_tree.dir/src/tree.cpp.o: ../src/tree.cpp + diff --git a/tree/build/CMakeFiles/seg_tree.dir/flags.make b/tree/build/CMakeFiles/seg_tree.dir/flags.make new file mode 100644 index 0000000..00e0b11 --- /dev/null +++ b/tree/build/CMakeFiles/seg_tree.dir/flags.make @@ -0,0 +1,8 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 2.8 + +# compile CXX with /usr/bin/c++ +CXX_FLAGS = -std=c++11 -g -I/System/Library/Frameworks/Python.framework/Headers -I/Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include + +CXX_DEFINES = + diff --git a/tree/build/CMakeFiles/seg_tree.dir/link.txt b/tree/build/CMakeFiles/seg_tree.dir/link.txt new file mode 100644 index 0000000..a64ee9a --- /dev/null +++ b/tree/build/CMakeFiles/seg_tree.dir/link.txt @@ -0,0 +1 @@ +/usr/bin/c++ -std=c++11 -g -Wl,-search_paths_first -Wl,-headerpad_max_install_names CMakeFiles/seg_tree.dir/src/tree.cpp.o -o seg_tree /usr/local/lib/libboost_python-mt.a /opt/ros/hydro/install_isolated/lib/libopencv_viz.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_videostab.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_video.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_ts.a /opt/ros/hydro/install_isolated/lib/libopencv_superres.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_stitching.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_softcascade.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_shape.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_photo.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_optim.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_objdetect.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_nonfree.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_ml.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_legacy.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_imgproc.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_highgui.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_flann.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_features2d.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudawarping.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudastereo.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaoptflow.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaimgproc.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudafilters.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudafeatures2d.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudabgsegm.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaarithm.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cuda.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_core.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_contrib.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_calib3d.3.0.0.dylib /usr/lib/libpython2.7.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudawarping.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_legacy.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaimgproc.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudafilters.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_video.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_objdetect.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_nonfree.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_ml.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaarithm.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_calib3d.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_features2d.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_highgui.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_imgproc.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_flann.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_core.3.0.0.dylib diff --git a/graph/build/CMakeFiles/segment.dir/progress.make b/tree/build/CMakeFiles/seg_tree.dir/progress.make similarity index 100% rename from graph/build/CMakeFiles/segment.dir/progress.make rename to tree/build/CMakeFiles/seg_tree.dir/progress.make diff --git a/tree/build/CMakeFiles/seg_tree.dir/src/tree.cpp.o b/tree/build/CMakeFiles/seg_tree.dir/src/tree.cpp.o new file mode 100644 index 0000000..de2baaa Binary files /dev/null and b/tree/build/CMakeFiles/seg_tree.dir/src/tree.cpp.o differ diff --git a/graph/build/CMakeFiles/segment_felz.dir/CXX.includecache b/tree/build/CMakeFiles/segmentation_tree.dir/CXX.includecache similarity index 94% rename from graph/build/CMakeFiles/segment_felz.dir/CXX.includecache rename to tree/build/CMakeFiles/segmentation_tree.dir/CXX.includecache index c7eb796..4de16ce 100644 --- a/graph/build/CMakeFiles/segment_felz.dir/CXX.includecache +++ b/tree/build/CMakeFiles/segmentation_tree.dir/CXX.includecache @@ -398,7 +398,7 @@ wctype.h /System/Library/Frameworks/Python.framework/Headers/weakrefobject.h -/Users/hans/MasterThesis/code/cpp/graph/src/CVBoostConverter.hpp +/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/CVBoostConverter.hpp Python.h - numpy/ndarrayobject.h @@ -412,37 +412,17 @@ boost/python.hpp cstdio - -/Users/hans/MasterThesis/code/cpp/graph/src/cluster.h +/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/edge.h -/Users/hans/MasterThesis/code/cpp/graph/src/edge.h - -/Users/hans/MasterThesis/code/cpp/graph/src/segment-graph.h -edge.h -/Users/hans/MasterThesis/code/cpp/graph/src/edge.h -cluster.h -/Users/hans/MasterThesis/code/cpp/graph/src/cluster.h - -/Users/hans/MasterThesis/code/cpp/graph/src/segment-image.h -segment-graph.h -/Users/hans/MasterThesis/code/cpp/graph/src/segment-graph.h -map -- - -/Users/hans/MasterThesis/code/cpp/graph/src/segment.cpp -opencv2/core/core.hpp -- -opencv2/imgproc/imgproc.hpp -- -opencv2/highgui/highgui.hpp -- -iostream -- -segment-image.h -/Users/hans/MasterThesis/code/cpp/graph/src/segment-image.h -ctime -- +/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/tree.cpp CVBoostConverter.hpp -/Users/hans/MasterThesis/code/cpp/graph/src/CVBoostConverter.hpp +/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/CVBoostConverter.hpp boost/python.hpp - +opencv2/opencv.hpp +- +unordered_map +- +edge.h +/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/edge.h diff --git a/graph/build/CMakeFiles/segment_felz.dir/DependInfo.cmake b/tree/build/CMakeFiles/segmentation_tree.dir/DependInfo.cmake similarity index 79% rename from graph/build/CMakeFiles/segment_felz.dir/DependInfo.cmake rename to tree/build/CMakeFiles/segmentation_tree.dir/DependInfo.cmake index 833207f..2ddc90f 100644 --- a/graph/build/CMakeFiles/segment_felz.dir/DependInfo.cmake +++ b/tree/build/CMakeFiles/segmentation_tree.dir/DependInfo.cmake @@ -4,7 +4,7 @@ SET(CMAKE_DEPENDS_LANGUAGES ) # The set of files for implicit dependencies of each language: SET(CMAKE_DEPENDS_CHECK_CXX - "/Users/hans/MasterThesis/code/cpp/graph/src/segment.cpp" "/Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/segment_felz.dir/src/segment.cpp.o" + "/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/tree.cpp" "/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/segmentation_tree.dir/src/tree.cpp.o" ) SET(CMAKE_CXX_COMPILER_ID "Clang") diff --git a/tree/build/CMakeFiles/segmentation_tree.dir/build.make b/tree/build/CMakeFiles/segmentation_tree.dir/build.make new file mode 100644 index 0000000..94d4fbb --- /dev/null +++ b/tree/build/CMakeFiles/segmentation_tree.dir/build.make @@ -0,0 +1,152 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 2.8 + +#============================================================================= +# 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 = /usr/local/Cellar/cmake/2.8.12.2/bin/cmake + +# The command to remove a file. +RM = /usr/local/Cellar/cmake/2.8.12.2/bin/cmake -E remove -f + +# Escaping for special characters. +EQUALS = = + +# The program to use to edit the cache. +CMAKE_EDIT_COMMAND = /usr/local/Cellar/cmake/2.8.12.2/bin/ccmake + +# The top-level source directory on which CMake was run. +CMAKE_SOURCE_DIR = /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based + +# The top-level build directory on which CMake was run. +CMAKE_BINARY_DIR = /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build + +# Include any dependencies generated for this target. +include CMakeFiles/segmentation_tree.dir/depend.make + +# Include the progress variables for this target. +include CMakeFiles/segmentation_tree.dir/progress.make + +# Include the compile flags for this target's objects. +include CMakeFiles/segmentation_tree.dir/flags.make + +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: CMakeFiles/segmentation_tree.dir/flags.make +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: ../src/tree.cpp + $(CMAKE_COMMAND) -E cmake_progress_report /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles $(CMAKE_PROGRESS_1) + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Building CXX object CMakeFiles/segmentation_tree.dir/src/tree.cpp.o" + /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -o CMakeFiles/segmentation_tree.dir/src/tree.cpp.o -c /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/tree.cpp + +CMakeFiles/segmentation_tree.dir/src/tree.cpp.i: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/segmentation_tree.dir/src/tree.cpp.i" + /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -E /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/tree.cpp > CMakeFiles/segmentation_tree.dir/src/tree.cpp.i + +CMakeFiles/segmentation_tree.dir/src/tree.cpp.s: cmake_force + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/segmentation_tree.dir/src/tree.cpp.s" + /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -S /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/tree.cpp -o CMakeFiles/segmentation_tree.dir/src/tree.cpp.s + +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o.requires: +.PHONY : CMakeFiles/segmentation_tree.dir/src/tree.cpp.o.requires + +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o.provides: CMakeFiles/segmentation_tree.dir/src/tree.cpp.o.requires + $(MAKE) -f CMakeFiles/segmentation_tree.dir/build.make CMakeFiles/segmentation_tree.dir/src/tree.cpp.o.provides.build +.PHONY : CMakeFiles/segmentation_tree.dir/src/tree.cpp.o.provides + +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o.provides.build: CMakeFiles/segmentation_tree.dir/src/tree.cpp.o + +# Object files for target segmentation_tree +segmentation_tree_OBJECTS = \ +"CMakeFiles/segmentation_tree.dir/src/tree.cpp.o" + +# External object files for target segmentation_tree +segmentation_tree_EXTERNAL_OBJECTS = + +segmentation_tree.so: CMakeFiles/segmentation_tree.dir/src/tree.cpp.o +segmentation_tree.so: CMakeFiles/segmentation_tree.dir/build.make +segmentation_tree.so: /usr/local/lib/libboost_python-mt.a +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_viz.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_videostab.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_video.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_ts.a +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_superres.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_stitching.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_softcascade.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_shape.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_photo.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_optim.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_objdetect.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_nonfree.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_ml.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_legacy.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_imgproc.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_highgui.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_flann.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_features2d.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudawarping.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudastereo.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudaoptflow.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudaimgproc.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudafilters.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudafeatures2d.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudabgsegm.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudaarithm.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_cuda.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_core.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_contrib.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_calib3d.3.0.0.dylib +segmentation_tree.so: /usr/lib/libpython2.7.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudawarping.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_legacy.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudaimgproc.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudafilters.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_video.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_objdetect.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_nonfree.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_ml.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_cudaarithm.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_calib3d.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_features2d.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_highgui.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_imgproc.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_flann.3.0.0.dylib +segmentation_tree.so: /opt/ros/hydro/install_isolated/lib/libopencv_core.3.0.0.dylib +segmentation_tree.so: CMakeFiles/segmentation_tree.dir/link.txt + @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --red --bold "Linking CXX shared module segmentation_tree.so" + $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/segmentation_tree.dir/link.txt --verbose=$(VERBOSE) + +# Rule to build all files generated by this target. +CMakeFiles/segmentation_tree.dir/build: segmentation_tree.so +.PHONY : CMakeFiles/segmentation_tree.dir/build + +CMakeFiles/segmentation_tree.dir/requires: CMakeFiles/segmentation_tree.dir/src/tree.cpp.o.requires +.PHONY : CMakeFiles/segmentation_tree.dir/requires + +CMakeFiles/segmentation_tree.dir/clean: + $(CMAKE_COMMAND) -P CMakeFiles/segmentation_tree.dir/cmake_clean.cmake +.PHONY : CMakeFiles/segmentation_tree.dir/clean + +CMakeFiles/segmentation_tree.dir/depend: + cd /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/segmentation_tree.dir/DependInfo.cmake --color=$(COLOR) +.PHONY : CMakeFiles/segmentation_tree.dir/depend + diff --git a/tree/build/CMakeFiles/segmentation_tree.dir/cmake_clean.cmake b/tree/build/CMakeFiles/segmentation_tree.dir/cmake_clean.cmake new file mode 100644 index 0000000..8f99a7c --- /dev/null +++ b/tree/build/CMakeFiles/segmentation_tree.dir/cmake_clean.cmake @@ -0,0 +1,10 @@ +FILE(REMOVE_RECURSE + "CMakeFiles/segmentation_tree.dir/src/tree.cpp.o" + "segmentation_tree.pdb" + "segmentation_tree.so" +) + +# Per-language clean rules from dependency scanning. +FOREACH(lang CXX) + INCLUDE(CMakeFiles/segmentation_tree.dir/cmake_clean_${lang}.cmake OPTIONAL) +ENDFOREACH(lang) diff --git a/graph/build/CMakeFiles/segment_felz.dir/depend.internal b/tree/build/CMakeFiles/segmentation_tree.dir/depend.internal similarity index 93% rename from graph/build/CMakeFiles/segment_felz.dir/depend.internal rename to tree/build/CMakeFiles/segmentation_tree.dir/depend.internal index 71df910..85afb4a 100644 --- a/graph/build/CMakeFiles/segment_felz.dir/depend.internal +++ b/tree/build/CMakeFiles/segmentation_tree.dir/depend.internal @@ -1,7 +1,7 @@ # CMAKE generated file: DO NOT EDIT! # Generated by "Unix Makefiles" Generator, CMake Version 2.8 -CMakeFiles/segment_felz.dir/src/segment.cpp.o +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/__multiarray_api.h /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/_neighborhood_iterator_imp.h /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/_numpyconfig.h @@ -75,9 +75,6 @@ CMakeFiles/segment_felz.dir/src/segment.cpp.o /System/Library/Frameworks/Python.framework/Headers/unicodeobject.h /System/Library/Frameworks/Python.framework/Headers/warnings.h /System/Library/Frameworks/Python.framework/Headers/weakrefobject.h - /Users/hans/MasterThesis/code/cpp/graph/src/CVBoostConverter.hpp - /Users/hans/MasterThesis/code/cpp/graph/src/cluster.h - /Users/hans/MasterThesis/code/cpp/graph/src/edge.h - /Users/hans/MasterThesis/code/cpp/graph/src/segment-graph.h - /Users/hans/MasterThesis/code/cpp/graph/src/segment-image.h - /Users/hans/MasterThesis/code/cpp/graph/src/segment.cpp + /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/CVBoostConverter.hpp + /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/edge.h + /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/src/tree.cpp diff --git a/tree/build/CMakeFiles/segmentation_tree.dir/depend.make b/tree/build/CMakeFiles/segmentation_tree.dir/depend.make new file mode 100644 index 0000000..eeb44a5 --- /dev/null +++ b/tree/build/CMakeFiles/segmentation_tree.dir/depend.make @@ -0,0 +1,80 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 2.8 + +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/__multiarray_api.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/_neighborhood_iterator_imp.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/_numpyconfig.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/ndarrayobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/ndarraytypes.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/npy_1_7_deprecated_api.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/npy_common.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/npy_cpu.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/npy_endian.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/numpyconfig.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/old_defines.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include/numpy/utils.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/Python.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/abstract.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/boolobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/bufferobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/bytearrayobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/bytesobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/cellobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/ceval.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/classobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/cobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/code.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/codecs.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/compile.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/complexobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/descrobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/dictobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/dtoa.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/enumobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/eval.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/fileobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/floatobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/funcobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/genobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/import.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/intobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/intrcheck.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/iterobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/listobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/longobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/memoryobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/methodobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/modsupport.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/moduleobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/object.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/objimpl.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/patchlevel.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyarena.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pycapsule.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyconfig.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyctype.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pydebug.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyerrors.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyfpe.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pymacconfig.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pymath.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pymem.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pyport.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pystate.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pystrcmp.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pystrtod.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/pythonrun.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/rangeobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/setobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/sliceobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/stringobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/sysmodule.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/traceback.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/tupleobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/unicodeobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/warnings.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: /System/Library/Frameworks/Python.framework/Headers/weakrefobject.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: ../src/CVBoostConverter.hpp +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: ../src/edge.h +CMakeFiles/segmentation_tree.dir/src/tree.cpp.o: ../src/tree.cpp + diff --git a/tree/build/CMakeFiles/segmentation_tree.dir/flags.make b/tree/build/CMakeFiles/segmentation_tree.dir/flags.make new file mode 100644 index 0000000..10069c6 --- /dev/null +++ b/tree/build/CMakeFiles/segmentation_tree.dir/flags.make @@ -0,0 +1,8 @@ +# CMAKE generated file: DO NOT EDIT! +# Generated by "Unix Makefiles" Generator, CMake Version 2.8 + +# compile CXX with /usr/bin/c++ +CXX_FLAGS = -std=c++11 -g -fPIC -I/System/Library/Frameworks/Python.framework/Headers -I/Library/Python/2.7/site-packages/numpy-1.8.0-py2.7-macosx-10.9-intel.egg/numpy/core/include + +CXX_DEFINES = -Dsegmentation_tree_EXPORTS + diff --git a/graph/build/CMakeFiles/segment.dir/link.txt b/tree/build/CMakeFiles/segmentation_tree.dir/link.txt similarity index 93% rename from graph/build/CMakeFiles/segment.dir/link.txt rename to tree/build/CMakeFiles/segmentation_tree.dir/link.txt index e80cb96..f5cf44d 100644 --- a/graph/build/CMakeFiles/segment.dir/link.txt +++ b/tree/build/CMakeFiles/segmentation_tree.dir/link.txt @@ -1 +1 @@ -/usr/bin/c++ -std=c++11 -O3 -Wl,-search_paths_first -Wl,-headerpad_max_install_names CMakeFiles/segment.dir/src/segment.cpp.o -o segment /usr/local/lib/libboost_python-mt.a /opt/ros/hydro/install_isolated/lib/libopencv_viz.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_videostab.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_video.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_ts.a /opt/ros/hydro/install_isolated/lib/libopencv_superres.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_stitching.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_softcascade.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_shape.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_photo.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_optim.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_objdetect.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_nonfree.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_ml.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_legacy.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_imgproc.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_highgui.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_flann.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_features2d.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudawarping.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudastereo.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaoptflow.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaimgproc.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudafilters.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudafeatures2d.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudabgsegm.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaarithm.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cuda.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_core.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_contrib.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_calib3d.3.0.0.dylib /usr/lib/libpython2.7.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudawarping.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_legacy.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaimgproc.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudafilters.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_video.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_objdetect.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_nonfree.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_ml.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaarithm.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_calib3d.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_features2d.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_highgui.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_imgproc.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_flann.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_core.3.0.0.dylib +/usr/bin/c++ -std=c++11 -g -bundle -Wl,-headerpad_max_install_names -o segmentation_tree.so CMakeFiles/segmentation_tree.dir/src/tree.cpp.o /usr/local/lib/libboost_python-mt.a /opt/ros/hydro/install_isolated/lib/libopencv_viz.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_videostab.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_video.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_ts.a /opt/ros/hydro/install_isolated/lib/libopencv_superres.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_stitching.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_softcascade.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_shape.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_photo.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_optim.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_objdetect.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_nonfree.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_ml.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_legacy.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_imgproc.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_highgui.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_flann.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_features2d.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudawarping.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudastereo.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaoptflow.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaimgproc.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudafilters.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudafeatures2d.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudabgsegm.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaarithm.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cuda.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_core.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_contrib.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_calib3d.3.0.0.dylib /usr/lib/libpython2.7.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudawarping.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_legacy.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaimgproc.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudafilters.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_video.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_objdetect.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_nonfree.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_ml.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_cudaarithm.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_calib3d.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_features2d.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_highgui.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_imgproc.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_flann.3.0.0.dylib /opt/ros/hydro/install_isolated/lib/libopencv_core.3.0.0.dylib diff --git a/graph/build/CMakeFiles/segment_felz.dir/progress.make b/tree/build/CMakeFiles/segmentation_tree.dir/progress.make similarity index 100% rename from graph/build/CMakeFiles/segment_felz.dir/progress.make rename to tree/build/CMakeFiles/segmentation_tree.dir/progress.make diff --git a/tree/build/CMakeFiles/segmentation_tree.dir/src/tree.cpp.o b/tree/build/CMakeFiles/segmentation_tree.dir/src/tree.cpp.o new file mode 100644 index 0000000..de2baaa Binary files /dev/null and b/tree/build/CMakeFiles/segmentation_tree.dir/src/tree.cpp.o differ diff --git a/graph/build/Makefile b/tree/build/Makefile similarity index 65% rename from graph/build/Makefile rename to tree/build/Makefile index 617f654..433305b 100644 --- a/graph/build/Makefile +++ b/tree/build/Makefile @@ -42,10 +42,10 @@ EQUALS = = CMAKE_EDIT_COMMAND = /usr/local/Cellar/cmake/2.8.12.2/bin/ccmake # The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /Users/hans/MasterThesis/code/cpp/graph +CMAKE_SOURCE_DIR = /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based # The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /Users/hans/MasterThesis/code/cpp/graph/build +CMAKE_BINARY_DIR = /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build #============================================================================= # Targets provided globally by CMake. @@ -72,9 +72,9 @@ rebuild_cache/fast: rebuild_cache # The main all target all: cmake_check_build_system - $(CMAKE_COMMAND) -E cmake_progress_start /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles/progress.marks + $(CMAKE_COMMAND) -E cmake_progress_start /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles/progress.marks $(MAKE) -f CMakeFiles/Makefile2 all - $(CMAKE_COMMAND) -E cmake_progress_start /Users/hans/MasterThesis/code/cpp/graph/build/CMakeFiles 0 + $(CMAKE_COMMAND) -E cmake_progress_start /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/CMakeFiles 0 .PHONY : all # The main clean target @@ -102,57 +102,57 @@ depend: .PHONY : depend #============================================================================= -# Target rules for targets named segment +# Target rules for targets named seg_tree # Build rule for target. -segment: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 segment -.PHONY : segment +seg_tree: cmake_check_build_system + $(MAKE) -f CMakeFiles/Makefile2 seg_tree +.PHONY : seg_tree # fast build rule for target. -segment/fast: - $(MAKE) -f CMakeFiles/segment.dir/build.make CMakeFiles/segment.dir/build -.PHONY : segment/fast +seg_tree/fast: + $(MAKE) -f CMakeFiles/seg_tree.dir/build.make CMakeFiles/seg_tree.dir/build +.PHONY : seg_tree/fast #============================================================================= -# Target rules for targets named segment_felz +# Target rules for targets named segmentation_tree # Build rule for target. -segment_felz: cmake_check_build_system - $(MAKE) -f CMakeFiles/Makefile2 segment_felz -.PHONY : segment_felz +segmentation_tree: cmake_check_build_system + $(MAKE) -f CMakeFiles/Makefile2 segmentation_tree +.PHONY : segmentation_tree # fast build rule for target. -segment_felz/fast: - $(MAKE) -f CMakeFiles/segment_felz.dir/build.make CMakeFiles/segment_felz.dir/build -.PHONY : segment_felz/fast +segmentation_tree/fast: + $(MAKE) -f CMakeFiles/segmentation_tree.dir/build.make CMakeFiles/segmentation_tree.dir/build +.PHONY : segmentation_tree/fast -src/segment.o: src/segment.cpp.o -.PHONY : src/segment.o +src/tree.o: src/tree.cpp.o +.PHONY : src/tree.o # target to build an object file -src/segment.cpp.o: - $(MAKE) -f CMakeFiles/segment.dir/build.make CMakeFiles/segment.dir/src/segment.cpp.o - $(MAKE) -f CMakeFiles/segment_felz.dir/build.make CMakeFiles/segment_felz.dir/src/segment.cpp.o -.PHONY : src/segment.cpp.o +src/tree.cpp.o: + $(MAKE) -f CMakeFiles/seg_tree.dir/build.make CMakeFiles/seg_tree.dir/src/tree.cpp.o + $(MAKE) -f CMakeFiles/segmentation_tree.dir/build.make CMakeFiles/segmentation_tree.dir/src/tree.cpp.o +.PHONY : src/tree.cpp.o -src/segment.i: src/segment.cpp.i -.PHONY : src/segment.i +src/tree.i: src/tree.cpp.i +.PHONY : src/tree.i # target to preprocess a source file -src/segment.cpp.i: - $(MAKE) -f CMakeFiles/segment.dir/build.make CMakeFiles/segment.dir/src/segment.cpp.i - $(MAKE) -f CMakeFiles/segment_felz.dir/build.make CMakeFiles/segment_felz.dir/src/segment.cpp.i -.PHONY : src/segment.cpp.i +src/tree.cpp.i: + $(MAKE) -f CMakeFiles/seg_tree.dir/build.make CMakeFiles/seg_tree.dir/src/tree.cpp.i + $(MAKE) -f CMakeFiles/segmentation_tree.dir/build.make CMakeFiles/segmentation_tree.dir/src/tree.cpp.i +.PHONY : src/tree.cpp.i -src/segment.s: src/segment.cpp.s -.PHONY : src/segment.s +src/tree.s: src/tree.cpp.s +.PHONY : src/tree.s # target to generate assembly for a file -src/segment.cpp.s: - $(MAKE) -f CMakeFiles/segment.dir/build.make CMakeFiles/segment.dir/src/segment.cpp.s - $(MAKE) -f CMakeFiles/segment_felz.dir/build.make CMakeFiles/segment_felz.dir/src/segment.cpp.s -.PHONY : src/segment.cpp.s +src/tree.cpp.s: + $(MAKE) -f CMakeFiles/seg_tree.dir/build.make CMakeFiles/seg_tree.dir/src/tree.cpp.s + $(MAKE) -f CMakeFiles/segmentation_tree.dir/build.make CMakeFiles/segmentation_tree.dir/src/tree.cpp.s +.PHONY : src/tree.cpp.s # Help Target help: @@ -162,11 +162,11 @@ help: @echo "... depend" @echo "... edit_cache" @echo "... rebuild_cache" - @echo "... segment" - @echo "... segment_felz" - @echo "... src/segment.o" - @echo "... src/segment.i" - @echo "... src/segment.s" + @echo "... seg_tree" + @echo "... segmentation_tree" + @echo "... src/tree.o" + @echo "... src/tree.i" + @echo "... src/tree.s" .PHONY : help diff --git a/graph/build/cmake_install.cmake b/tree/build/cmake_install.cmake similarity index 79% rename from graph/build/cmake_install.cmake rename to tree/build/cmake_install.cmake index 80013ac..55d47d7 100644 --- a/graph/build/cmake_install.cmake +++ b/tree/build/cmake_install.cmake @@ -1,4 +1,4 @@ -# Install script for directory: /Users/hans/MasterThesis/code/cpp/graph +# Install script for directory: /Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based # Set the install prefix IF(NOT DEFINED CMAKE_INSTALL_PREFIX) @@ -33,7 +33,7 @@ ELSE(CMAKE_INSTALL_COMPONENT) SET(CMAKE_INSTALL_MANIFEST "install_manifest.txt") ENDIF(CMAKE_INSTALL_COMPONENT) -FILE(WRITE "/Users/hans/MasterThesis/code/cpp/graph/build/${CMAKE_INSTALL_MANIFEST}" "") +FILE(WRITE "/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/${CMAKE_INSTALL_MANIFEST}" "") FOREACH(file ${CMAKE_INSTALL_MANIFEST_FILES}) - FILE(APPEND "/Users/hans/MasterThesis/code/cpp/graph/build/${CMAKE_INSTALL_MANIFEST}" "${file}\n") + FILE(APPEND "/Users/hans/Dropbox/Uni/MasterThesis/code/cpp/edge-based/build/${CMAKE_INSTALL_MANIFEST}" "${file}\n") ENDFOREACH(file) diff --git a/tree/build/seg_tree b/tree/build/seg_tree new file mode 100755 index 0000000..ac0c23d Binary files /dev/null and b/tree/build/seg_tree differ diff --git a/tree/build/segmentation_tree.so b/tree/build/segmentation_tree.so new file mode 100755 index 0000000..89f206e Binary files /dev/null and b/tree/build/segmentation_tree.so differ diff --git a/tree/cmake/FindNumPy.cmake b/tree/cmake/FindNumPy.cmake new file mode 100644 index 0000000..eafed16 --- /dev/null +++ b/tree/cmake/FindNumPy.cmake @@ -0,0 +1,102 @@ +# - Find the NumPy libraries +# This module finds if NumPy is installed, and sets the following variables +# indicating where it is. +# +# TODO: Update to provide the libraries and paths for linking npymath lib. +# +# NUMPY_FOUND - was NumPy found +# NUMPY_VERSION - the version of NumPy found as a string +# NUMPY_VERSION_MAJOR - the major version number of NumPy +# NUMPY_VERSION_MINOR - the minor version number of NumPy +# NUMPY_VERSION_PATCH - the patch version number of NumPy +# NUMPY_VERSION_DECIMAL - e.g. version 1.6.1 is 10601 +# NUMPY_INCLUDE_DIRS - path to the NumPy include files + +#============================================================================ +# Copyright 2012 Continuum Analytics, Inc. +# +# MIT License +# +# Permission is hereby granted, free of charge, to any person obtaining +# a copy of this software and associated documentation files +# (the "Software"), to deal in the Software without restriction, including +# without limitation the rights to use, copy, modify, merge, publish, +# distribute, sublicense, and/or sell copies of the Software, and to permit +# persons to whom the Software is furnished to do so, subject to +# the following conditions: +# +# The above copyright notice and this permission notice shall be included +# in all copies or substantial portions of the Software. +# +# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS +# OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, +# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL +# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR +# OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, +# ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR +# OTHER DEALINGS IN THE SOFTWARE. +# +#============================================================================ + +# Finding NumPy involves calling the Python interpreter +if(NumPy_FIND_REQUIRED) + find_package(PythonInterp REQUIRED) +else() + find_package(PythonInterp) +endif() + +if(NOT PYTHONINTERP_FOUND) + set(NUMPY_FOUND FALSE) + return() +endif() + +execute_process(COMMAND "${PYTHON_EXECUTABLE}" "-c" + "import numpy as n; print(n.__version__); print(n.get_include());" + RESULT_VARIABLE _NUMPY_SEARCH_SUCCESS + OUTPUT_VARIABLE _NUMPY_VALUES_OUTPUT + ERROR_VARIABLE _NUMPY_ERROR_VALUE + OUTPUT_STRIP_TRAILING_WHITESPACE) + +if(NOT _NUMPY_SEARCH_SUCCESS MATCHES 0) + if(NumPy_FIND_REQUIRED) + message(FATAL_ERROR + "NumPy import failure:\n${_NUMPY_ERROR_VALUE}") + endif() + set(NUMPY_FOUND FALSE) + return() +endif() + +# Convert the process output into a list +string(REGEX REPLACE ";" "\\\\;" _NUMPY_VALUES ${_NUMPY_VALUES_OUTPUT}) +string(REGEX REPLACE "\n" ";" _NUMPY_VALUES ${_NUMPY_VALUES}) +# Just in case there is unexpected output from the Python command. +list(GET _NUMPY_VALUES -2 NUMPY_VERSION) +list(GET _NUMPY_VALUES -1 NUMPY_INCLUDE_DIRS) + +string(REGEX MATCH "^[0-9]+\\.[0-9]+\\.[0-9]+" _VER_CHECK "${NUMPY_VERSION}") +if("${_VER_CHECK}" STREQUAL "") + # The output from Python was unexpected. Raise an error always + # here, because we found NumPy, but it appears to be corrupted somehow. + message(FATAL_ERROR + "Requested version and include path from NumPy, got instead:\n${_NUMPY_VALUES_OUTPUT}\n") + return() +endif() + +# Make sure all directory separators are '/' +string(REGEX REPLACE "\\\\" "/" NUMPY_INCLUDE_DIRS ${NUMPY_INCLUDE_DIRS}) + +# Get the major and minor version numbers +string(REGEX REPLACE "\\." ";" _NUMPY_VERSION_LIST ${NUMPY_VERSION}) +list(GET _NUMPY_VERSION_LIST 0 NUMPY_VERSION_MAJOR) +list(GET _NUMPY_VERSION_LIST 1 NUMPY_VERSION_MINOR) +list(GET _NUMPY_VERSION_LIST 2 NUMPY_VERSION_PATCH) +string(REGEX MATCH "[0-9]*" NUMPY_VERSION_PATCH ${NUMPY_VERSION_PATCH}) +math(EXPR NUMPY_VERSION_DECIMAL + "(${NUMPY_VERSION_MAJOR} * 10000) + (${NUMPY_VERSION_MINOR} * 100) + ${NUMPY_VERSION_PATCH}") + +find_package_message(NUMPY + "Found NumPy: version \"${NUMPY_VERSION}\" ${NUMPY_INCLUDE_DIRS}" + "${NUMPY_INCLUDE_DIRS}${NUMPY_VERSION}") + +set(NUMPY_FOUND TRUE) + diff --git a/tree/old/Connection.cpp b/tree/old/Connection.cpp new file mode 100644 index 0000000..2e5cc42 --- /dev/null +++ b/tree/old/Connection.cpp @@ -0,0 +1,42 @@ +#include "Connection.h" +#include "Surface.h" + +Connection::Connection(Surface * a, Surface * b): + a(a), b(b), median(0), changed(true) +{} + +std::ostream& operator<<(std::ostream& os, const Connection & c) { + os << *c.a << " -> " << *c.b << ": "; + //for (auto pixel: c.edge) + // os << int(pixel) << ", "; + return os; +} + +void Connection::add(uint8_t value) { + changed = true; + if (edge.size() == 0) edge.push_back(value); +} + +uint8_t Connection::computeMedian() { + if (changed) { + std::sort(edge.begin(), edge.end()); + median = edge[edge.size() / 2]; + } + + changed = false; + return median; +} + +void Connection::merge(std::vector other_edge) { + changed = true; + std::vector tmp; + tmp.reserve(edge.size() + other_edge.size()); + std::merge(edge.begin(), edge.end(), other_edge.begin(), other_edge.end(), std::back_inserter(tmp)); + edge.swap(tmp); +} + +std::ostream& operator<<(std::ostream& os, const ConnectionSet & cs) { + for (auto& c: cs) + os << *c << std::endl; + return os; +} diff --git a/tree/old/Connection.h b/tree/old/Connection.h new file mode 100644 index 0000000..14f3e5e --- /dev/null +++ b/tree/old/Connection.h @@ -0,0 +1,63 @@ +/* + * Connection.h + * + * Created on: Mar 19, 2014 + * Author: hans + */ + +#ifndef CONNECTION_H_ +#define CONNECTION_H_ + +#include +#include +#include +#include +#include +#include + +class Surface; + +class Connection { +public: + Surface * a; + Surface * b; + std::vector edge; + uint8_t median; + bool changed; + + Connection(Surface * a, Surface * b); + + friend std::ostream& operator<<(std::ostream& os, const Connection & c); + + void add(uint8_t value); + void merge(std::vector other_edge); + uint8_t computeMedian(); +}; + +struct ConnectionHash { + size_t operator() (const std::unique_ptr & c) const { + size_t hash = 0; + if (c) { + hash = std::hash()(c->a) ^ std::hash()(c->b); + } + + return hash; + } +}; + +struct ConnectionEqual { + bool operator() (const std::unique_ptr & lhs, const std::unique_ptr & rhs) const { + if (lhs == rhs) + return true; + if (!lhs || !rhs) + return false; + + return (lhs->a == rhs->a && lhs->b == rhs->b) || (lhs->b == rhs->a && lhs->a == rhs->b); + } +}; + +typedef std::unordered_set, ConnectionHash, ConnectionEqual> ConnectionSet; + +std::ostream& operator<<(std::ostream& os, const ConnectionSet & cs); + +#endif /* CONNECTION_H_ */ diff --git a/tree/old/Surface.cpp b/tree/old/Surface.cpp new file mode 100644 index 0000000..042382e --- /dev/null +++ b/tree/old/Surface.cpp @@ -0,0 +1,52 @@ +#include "Surface.h" + +/*bool Surface::equals(const Surface & s) const { + for (auto id: ids) + if (s.ids.find(id) == s.ids.end()) + return false; + return true; +}*/ + +/*Surface& Surface::operator=(const Surface & s) { + ids = s.ids; + return *this; +}*/ + +void Surface::addConnection(Connection * c) { + //cm[s].push_back(pixel); + cs.insert(c); +} + +void Surface::merge(Connection * conn) { + conn->a->ids.insert(conn->b->ids.begin(), conn->b->ids.end()); + conn->a->cs.erase(conn); + conn->b->cs.erase(conn); + + for (auto c: conn->b->cs) { + Surface * neighbour = c->b == conn->b ? c->a : c->b; + auto it = conn->a->cs.find(new Connection(conn->a, neighbour)); + + // it already exists + if (it != conn->a->cs.end()) { + Connection * c2 = *it; + c2->merge(c->edge); + } + else { + if (c->b == conn->b) c->b = conn->a; + else c->a = conn->a; + } + } +} + +std::ostream& operator<<(std::ostream& os, const Surface & s) { + os << "["; + for (auto id: s.ids) + os << int(id) << ", "; + return os << "]"; +} + +std::ostream& operator<<(std::ostream& os, const SurfaceSet & ss) { + for (auto& s: ss) + os << *(s.get()) << std::endl; + return os; +} diff --git a/tree/old/Surface.h b/tree/old/Surface.h new file mode 100644 index 0000000..6009614 --- /dev/null +++ b/tree/old/Surface.h @@ -0,0 +1,62 @@ +/* + * Surface.h + * + * Created on: Mar 19, 2014 + * Author: hans + */ + +#ifndef SURFACE_H_ +#define SURFACE_H_ + +#include +#include +#include +#include + +#include "Connection.h" + +class Surface { +public: + std::unordered_set cs; + std::unordered_set ids; + size_t hash; + + Surface(int id) { + ids.insert(id); + hash = id; + }; + + //bool equals(const Surface & s) const; + //Surface& operator=(const Surface & s); + + void addConnection(Connection * c); + static void merge(Connection * conn); + + friend std::ostream& operator<<(std::ostream& os, const Surface & s); +}; + +struct SurfaceHash { + size_t operator() (const std::unique_ptr & s) const { + return s->hash; + } +}; + +struct SurfaceEqual { + bool operator() (const std::unique_ptr & a, const std::unique_ptr & b) const { + //std::cout<<"SurfaceEqual"<ids) + if (b->ids.find(id) == b->ids.end()) + return false; + return true; + } +}; + +typedef std::unordered_set, SurfaceHash, SurfaceEqual> SurfaceSet; +std::ostream& operator<<(std::ostream& os, const SurfaceSet & ss); + +#endif /* SURFACE_H_ */ diff --git a/tree/old/segmentation_tree.cpp b/tree/old/segmentation_tree.cpp new file mode 100644 index 0000000..55bbde8 --- /dev/null +++ b/tree/old/segmentation_tree.cpp @@ -0,0 +1,132 @@ +#include +#include +#include +#include +#include +#include + +#include "Surface.h" +#include "Connection.h" + +Surface* addSurface(SurfaceSet & ss, uint8_t id) { + //std::cout<<"addSurface"< s_(new Surface(id)); + //auto it = ss.find(s_); + //if (it != ss.end()) + // return it->get(); + //else + return ss.insert(std::move(s_)).first->get(); +} + +Connection* addConnection(ConnectionSet & cs, Surface * s1, Surface * s2) { + //std::cout<<"addConnection"< c_(new Connection(s1, s2)); + //auto it = cs.find(c_); + //if (it != cs.end()) + // return it->get(); + //else + return cs.insert(std::move(c_)).first->get(); +} + +void calculateConnections(cv::Mat segmentation, cv::Mat edge) { + SurfaceSet ss; + ConnectionSet cs; + + cv::Mat nonzero; + cv::findNonZero(segmentation == 0, nonzero); + for (int i = 0; i < nonzero.total(); i++) { + cv::Point p = nonzero.at(i); + if (p.x <= 0 || p.x >= segmentation.cols - 1 || p.y <= 0 || p.y >= segmentation.rows - 1) + continue; + + if (segmentation.at(p.y-1, p.x) > 0 && segmentation.at(p.y+1, p.x) > 0 && segmentation.at(p.y-1, p.x) != segmentation.at(p.y+1, p.x)) { + Surface * s1 = addSurface(ss, segmentation.at(p.y-1, p.x)); + Surface * s2 = addSurface(ss, segmentation.at(p.y+1, p.x)); + Connection * c = addConnection(cs, s1, s2); + + c->add(edge.at(p.y, p.x)); + s1->addConnection(c); + s2->addConnection(c); + + //if (segmented_edge) segmented_edge->at(p.y, p.x) = edge.at(p.y, p.x); + } + else if (segmentation.at(p.y, p.x-1) > 0 && segmentation.at(p.y, p.x+1) > 0 && segmentation.at(p.y, p.x-1) != segmentation.at(p.y, p.x+1)) { + Surface * s1 = addSurface(ss, segmentation.at(p.y, p.x-1)); + Surface * s2 = addSurface(ss, segmentation.at(p.y, p.x+1)); + Connection * c = addConnection(cs, s1, s2); + + c->add(edge.at(p.y, p.x)); + s1->addConnection(c); + s2->addConnection(c); + //if (segmented_edge) segmented_edge->at(p.y, p.x) = edge.at(p.y, p.x); + } + } + + std::cout << "size: " << ss.size() << std::endl; + + /*while (cs.size() != 1) { + uint8_t min_median = 255; + Connection * min_conn; + for (auto& c: cs) { + uint8_t median = c->computeMedian(); + if (median < min_median) { + min_median = median; + min_conn = c.get(); + } + } + //std::cout << "ConnectionSet: " << cs << std::endl; + //std::cout << "MinConn: " << *min_conn << std::endl; + //if (cs.find(min_conn) == cs.end()) std::cout << cs << std::endl; + cs.erase(std::unique_ptr(min_conn)); + Surface::merge(min_conn); + }*/ + + //std::cout << cs << std::endl; + //std::cout << *min_conn << std::endl; + + //std::cout << "Min Edge: " << *min_conn << " with edge: " << int(min_edge) << std::endl; +} + +int main(int argc, char * argv[]) { + //cv::namedWindow("Segmentation", cv::WINDOW_NORMAL); + //cv::namedWindow("Edge", cv::WINDOW_NORMAL); + //cv::namedWindow("Segmented Edge", cv::WINDOW_NORMAL); + //cv::startWindowThread(); + cv::Mat segmentation = cv::imread("segmentation.png", cv::IMREAD_GRAYSCALE); + cv::Mat edge = cv::imread("edge.png", cv::IMREAD_GRAYSCALE); + cv::Mat segmented_edge = cv::Mat::zeros(segmentation.size(), CV_8UC1); + //cv::imshow("Segmentation", segmentation); + //cv::imshow("Edge", edge); + + std::clock_t begin = std::clock(); + + /*ConnectionStrengthMap csm = calculateConnections(segmentation, edge, &segmented_edge); + + ConnectionMedianMap cmm; + const Connection * min_conn = NULL; + uint8_t min_edge = 255; + for (ConnectionStrengthMap::iterator it = csm.begin(); it != csm.end(); ++it) { + std::sort(it->second.begin(), it->second.end()); + cmm[it->first] = it->second[it->second.size() / 2]; + if (cmm[it->first] < min_edge) { + min_edge = cmm[it->first]; + min_conn = &it->first; + } + } + + for (ConnectionMedianMap::iterator it = cmm.begin(); it != cmm.end(); ++it) { + std::cout << it->first << " : " << int(it->second) << std::endl; + } + + std::cout << *min_conn << " : " << int(min_edge) << std::endl;*/ + + calculateConnections(segmentation, edge); + + std::clock_t end = std::clock(); + double elapsed_secs = double(end - begin) / CLOCKS_PER_SEC; + std::cout << "Times passed in seconds: " << elapsed_secs << std::endl; + //cv::imshow("Segmented Edge", segmented_edge); + + //cv::waitKey(); + return 0; +} diff --git a/tree/old/thesis b/tree/old/thesis new file mode 100755 index 0000000..13fbddf Binary files /dev/null and b/tree/old/thesis differ diff --git a/tree/old/thesis.dSYM/Contents/Info.plist b/tree/old/thesis.dSYM/Contents/Info.plist new file mode 100644 index 0000000..83bc2bf --- /dev/null +++ b/tree/old/thesis.dSYM/Contents/Info.plist @@ -0,0 +1,20 @@ + + + + + CFBundleDevelopmentRegion + English + CFBundleIdentifier + com.apple.xcode.dsym.thesis + CFBundleInfoDictionaryVersion + 6.0 + CFBundlePackageType + dSYM + CFBundleSignature + ???? + CFBundleShortVersionString + 1.0 + CFBundleVersion + 1 + + diff --git a/tree/old/thesis.dSYM/Contents/Resources/DWARF/thesis b/tree/old/thesis.dSYM/Contents/Resources/DWARF/thesis new file mode 100644 index 0000000..c1920ff Binary files /dev/null and b/tree/old/thesis.dSYM/Contents/Resources/DWARF/thesis differ diff --git a/tree/src/CVBoostConverter.hpp b/tree/src/CVBoostConverter.hpp new file mode 100644 index 0000000..5bbf456 --- /dev/null +++ b/tree/src/CVBoostConverter.hpp @@ -0,0 +1,423 @@ +/* + * CVBoostConverter.hpp + * + * Created on: Mar 20, 2014 + * Author: Gregory Kramida + * Copyright: (c) 2014 Gregory Kramida + * License: MIT + */ + +#ifndef CVBOOSTCONVERTER_HPP_ +#define CVBOOSTCONVERTER_HPP_ + +#define NPY_NO_DEPRECATED_API NPY_1_7_API_VERSION +#include +#include +#include +#include +#include +#include + +using namespace cv; +namespace bcvt{ +static PyObject* opencv_error = 0; + +class PyAllowThreads { +public: + PyAllowThreads() : + _state(PyEval_SaveThread()) { + } + ~PyAllowThreads() { + PyEval_RestoreThread(_state); + } +private: + PyThreadState* _state; +}; + +class PyEnsureGIL { +public: + PyEnsureGIL() : + _state(PyGILState_Ensure()) { + } + ~PyEnsureGIL() { + PyGILState_Release(_state); + } +private: + PyGILState_STATE _state; +}; +#define ERRWRAP2(expr) \ +try \ +{ \ + PyAllowThreads allowThreads; \ + expr; \ +} \ +catch (const cv::Exception &e) \ +{ \ + PyErr_SetString(opencv_error, e.what()); \ + return 0; \ +} + +class NumpyAllocator: public MatAllocator { +public: + NumpyAllocator() { + stdAllocator = Mat::getStdAllocator(); + } + ~NumpyAllocator() { + } + + UMatData* allocate(PyObject* o, int dims, const int* sizes, int type, + size_t* step) const { + UMatData* u = new UMatData(this); + u->data = u->origdata = (uchar*) PyArray_DATA((PyArrayObject*) o); + npy_intp* _strides = PyArray_STRIDES((PyArrayObject*) o); + for (int i = 0; i < dims - 1; i++) + step[i] = (size_t) _strides[i]; + step[dims - 1] = CV_ELEM_SIZE(type); + u->size = sizes[0] * step[0]; + u->userdata = o; + return u; + } + + UMatData* allocate(int dims0, const int* sizes, int type, void* data, + size_t* step, int flags, UMatUsageFlags usageFlags) const { + if (data != 0) { + CV_Error(Error::StsAssert, "The data should normally be NULL!"); + // probably this is safe to do in such extreme case + return stdAllocator->allocate(dims0, sizes, type, data, step, flags, + usageFlags); + } + PyEnsureGIL gil; + + int depth = CV_MAT_DEPTH(type); + int cn = CV_MAT_CN(type); + const int f = (int) (sizeof(size_t) / 8); + int typenum = + depth == CV_8U ? NPY_UBYTE : + depth == CV_8S ? NPY_BYTE : + depth == CV_16U ? NPY_USHORT : + depth == CV_16S ? NPY_SHORT : + depth == CV_32S ? NPY_INT : + depth == CV_32F ? NPY_FLOAT : + depth == CV_64F ? + NPY_DOUBLE : f * NPY_ULONGLONG + (f ^ 1) * NPY_UINT; + int i, dims = dims0; + cv::AutoBuffer _sizes(dims + 1); + for (i = 0; i < dims; i++) + _sizes[i] = sizes[i]; + if (cn > 1) + _sizes[dims++] = cn; + PyObject* o = PyArray_SimpleNew(dims, _sizes, typenum); + if (!o) + CV_Error_(Error::StsError, + ("The numpy array of typenum=%d, ndims=%d can not be created", typenum, dims)); + return allocate(o, dims0, sizes, type, step); + } + + bool allocate(UMatData* u, int accessFlags, + UMatUsageFlags usageFlags) const { + return stdAllocator->allocate(u, accessFlags, usageFlags); + } + + void deallocate(UMatData* u) const { + if (u) { + PyEnsureGIL gil; + PyObject* o = (PyObject*) u->userdata; + Py_XDECREF(o); + delete u; + } + } + + const MatAllocator* stdAllocator; +}; + +NumpyAllocator g_numpyAllocator; + +PyObject* fromMatToNDArray(const Mat& m) { + if (!m.data) + Py_RETURN_NONE; + Mat temp, + *p = (Mat*) &m; + if (!p->u || p->allocator != &g_numpyAllocator) { + temp.allocator = &g_numpyAllocator; + ERRWRAP2(m.copyTo(temp)); + p = &temp; + } + PyObject* o = (PyObject*) p->u->userdata; + Py_INCREF(o); + return o; +} + +static int failmsg(const char *fmt, ...) { + char str[1000]; + + va_list ap; + va_start(ap, fmt); + vsnprintf(str, sizeof(str), fmt, ap); + va_end(ap); + + PyErr_SetString(PyExc_TypeError, str); + return 0; +} + +Mat fromNDArrayToMat(PyObject* o) { + cv::Mat m; + bool allowND = true; + if (!PyArray_Check(o)) { + failmsg("argument is not a numpy array"); + if (!m.data) + m.allocator = &g_numpyAllocator; + } else { + PyArrayObject* oarr = (PyArrayObject*) o; + + bool needcopy = false, needcast = false; + int typenum = PyArray_TYPE(oarr), new_typenum = typenum; + int type = typenum == NPY_UBYTE ? CV_8U : typenum == NPY_BYTE ? CV_8S : + typenum == NPY_USHORT ? CV_16U : + typenum == NPY_SHORT ? CV_16S : + typenum == NPY_INT ? CV_32S : + typenum == NPY_INT32 ? CV_32S : + typenum == NPY_FLOAT ? CV_32F : + typenum == NPY_DOUBLE ? CV_64F : -1; + + if (type < 0) { + if (typenum == NPY_INT64 || typenum == NPY_UINT64 + || type == NPY_LONG) { + needcopy = needcast = true; + new_typenum = NPY_INT; + type = CV_32S; + } else { + failmsg("Argument data type is not supported"); + m.allocator = &g_numpyAllocator; + return m; + } + } + +#ifndef CV_MAX_DIM + const int CV_MAX_DIM = 32; +#endif + + int ndims = PyArray_NDIM(oarr); + if (ndims >= CV_MAX_DIM) { + failmsg("Dimensionality of argument is too high"); + if (!m.data) + m.allocator = &g_numpyAllocator; + return m; + } + + int size[CV_MAX_DIM + 1]; + size_t step[CV_MAX_DIM + 1]; + size_t elemsize = CV_ELEM_SIZE1(type); + const npy_intp* _sizes = PyArray_DIMS(oarr); + const npy_intp* _strides = PyArray_STRIDES(oarr); + bool ismultichannel = ndims == 3 && _sizes[2] <= CV_CN_MAX; + + for (int i = ndims - 1; i >= 0 && !needcopy; i--) { + // these checks handle cases of + // a) multi-dimensional (ndims > 2) arrays, as well as simpler 1- and 2-dimensional cases + // b) transposed arrays, where _strides[] elements go in non-descending order + // c) flipped arrays, where some of _strides[] elements are negative + if ((i == ndims - 1 && (size_t) _strides[i] != elemsize) + || (i < ndims - 1 && _strides[i] < _strides[i + 1])) + needcopy = true; + } + + if (ismultichannel && _strides[1] != (npy_intp) elemsize * _sizes[2]) + needcopy = true; + + if (needcopy) { + + if (needcast) { + o = PyArray_Cast(oarr, new_typenum); + oarr = (PyArrayObject*) o; + } else { + oarr = PyArray_GETCONTIGUOUS(oarr); + o = (PyObject*) oarr; + } + + _strides = PyArray_STRIDES(oarr); + } + + for (int i = 0; i < ndims; i++) { + size[i] = (int) _sizes[i]; + step[i] = (size_t) _strides[i]; + } + + // handle degenerate case + if (ndims == 0) { + size[ndims] = 1; + step[ndims] = elemsize; + ndims++; + } + + if (ismultichannel) { + ndims--; + type |= CV_MAKETYPE(0, size[2]); + } + + if (ndims > 2 && !allowND) { + failmsg("%s has more than 2 dimensions"); + } else { + + m = Mat(ndims, size, type, PyArray_DATA(oarr), step); + m.u = g_numpyAllocator.allocate(o, ndims, size, type, step); + m.addref(); + + if (!needcopy) { + Py_INCREF(o); + } + } + m.allocator = &g_numpyAllocator; + } + return m; +} + +struct matToNDArrayBoostConverter { + static PyObject* convert(Mat const& m) { + if (!m.data) + Py_RETURN_NONE; + Mat *p = (Mat*) &m; + Mat temp; + if (!p->u || p->allocator != &g_numpyAllocator) { + temp.allocator = &g_numpyAllocator; + ERRWRAP2(m.copyTo(temp)); + p = &temp; + } + PyObject* o = (PyObject*) p->u->userdata; + return boost::python::incref(o); + } +}; + +struct matFromNDArrayBoostConverter { + + matFromNDArrayBoostConverter() { + boost::python::converter::registry::push_back(convertible, construct, + boost::python::type_id()); + } + + /// @brief Check if PyObject is an array and can be converted to OpenCV matrix. + static void* convertible(PyObject* object) { + if (!PyArray_Check(object)) { + return NULL; + } +#ifndef CV_MAX_DIM + const int CV_MAX_DIM = 32; +#endif + PyArrayObject* oarr = (PyArrayObject*) object; + + int typenum = PyArray_TYPE(oarr); + if (typenum != NPY_INT64 && typenum != NPY_UINT64 && typenum != NPY_LONG + && typenum != NPY_UBYTE && typenum != NPY_BYTE + && typenum != NPY_USHORT && typenum != NPY_SHORT + && typenum != NPY_INT && typenum != NPY_INT32 + && typenum != NPY_FLOAT && typenum != NPY_DOUBLE) { + return NULL; + } + int ndims = PyArray_NDIM(oarr); //data type not supported + + if (ndims >= CV_MAX_DIM) { + return NULL; //too many dimensions + } + return object; + } + + /// @brief Construct a Mat from an NDArray object. + static void construct(PyObject* object, + boost::python::converter::rvalue_from_python_stage1_data* data) { + namespace python = boost::python; + // Object is a borrowed reference, so create a handle indicting it is + // borrowed for proper reference counting. + python::handle<> handle(python::borrowed(object)); + + // Obtain a handle to the memory block that the converter has allocated + // for the C++ type. + typedef python::converter::rvalue_from_python_storage storage_type; + void* storage = reinterpret_cast(data)->storage.bytes; + + // Allocate the C++ type into the converter's memory block, and assign + // its handle to the converter's convertible variable. The C++ + // container is populated by passing the begin and end iterators of + // the python object to the container's constructor. + PyArrayObject* oarr = (PyArrayObject*) object; + + bool needcopy = false, needcast = false; + int typenum = PyArray_TYPE(oarr), new_typenum = typenum; + int type = typenum == NPY_UBYTE ? CV_8U : typenum == NPY_BYTE ? CV_8S : + typenum == NPY_USHORT ? CV_16U : + typenum == NPY_SHORT ? CV_16S : + typenum == NPY_INT ? CV_32S : + typenum == NPY_INT32 ? CV_32S : + typenum == NPY_FLOAT ? CV_32F : + typenum == NPY_DOUBLE ? CV_64F : -1; + + if (type < 0) { + needcopy = needcast = true; + new_typenum = NPY_INT; + type = CV_32S; + } + +#ifndef CV_MAX_DIM + const int CV_MAX_DIM = 32; +#endif + int ndims = PyArray_NDIM(oarr); + + int size[CV_MAX_DIM + 1]; + size_t step[CV_MAX_DIM + 1]; + size_t elemsize = CV_ELEM_SIZE1(type); + const npy_intp* _sizes = PyArray_DIMS(oarr); + const npy_intp* _strides = PyArray_STRIDES(oarr); + bool ismultichannel = ndims == 3 && _sizes[2] <= CV_CN_MAX; + + for (int i = ndims - 1; i >= 0 && !needcopy; i--) { + // these checks handle cases of + // a) multi-dimensional (ndims > 2) arrays, as well as simpler 1- and 2-dimensional cases + // b) transposed arrays, where _strides[] elements go in non-descending order + // c) flipped arrays, where some of _strides[] elements are negative + if ((i == ndims - 1 && (size_t) _strides[i] != elemsize) + || (i < ndims - 1 && _strides[i] < _strides[i + 1])) + needcopy = true; + } + + if (ismultichannel && _strides[1] != (npy_intp) elemsize * _sizes[2]) + needcopy = true; + + if (needcopy) { + + if (needcast) { + object = PyArray_Cast(oarr, new_typenum); + oarr = (PyArrayObject*) object; + } else { + oarr = PyArray_GETCONTIGUOUS(oarr); + object = (PyObject*) oarr; + } + + _strides = PyArray_STRIDES(oarr); + } + + for (int i = 0; i < ndims; i++) { + size[i] = (int) _sizes[i]; + step[i] = (size_t) _strides[i]; + } + + // handle degenerate case + if (ndims == 0) { + size[ndims] = 1; + step[ndims] = elemsize; + ndims++; + } + + if (ismultichannel) { + ndims--; + type |= CV_MAKETYPE(0, size[2]); + } + if (!needcopy) { + Py_INCREF(object); + } + cv::Mat* m = new (storage) cv::Mat(ndims, size, type, PyArray_DATA(oarr), step); + m->u = g_numpyAllocator.allocate(object, ndims, size, type, step); + m->allocator = &g_numpyAllocator; + m->addref(); + data->convertible = storage; + } +}; +} // end namespace bcvt +#endif /* CVBOOSTCONVERTER_HPP_ */ diff --git a/tree/src/edge.h b/tree/src/edge.h new file mode 100644 index 0000000..556a762 --- /dev/null +++ b/tree/src/edge.h @@ -0,0 +1,52 @@ +#ifndef EDGE_H_ +#define EDGE_H_ + +class Edge { +public: + Edge() : a(0), b(0), median(0) {} + Edge(int a, int b, std::vector edges) : + a(a), b(b), edges(edges) {} + Edge(int a, int b, std::vector edges, bool compute) : + a(a), b(b), edges(edges) + { + if (compute) calcMedian(); + } + + int calcMedian() { + std::sort(edges.begin(), edges.end()); + median = edges[edges.size()/2]; + return median; + } + + void updateBox(cv::Point p) { + min.x = min.x < p.x ? min.x : p.x; + min.y = min.y < p.y ? min.y : p.y; + max.x = max.x > p.x ? max.x : p.x; + max.y = max.y > p.y ? max.y : p.y; + } + + cv::Rect getRect() { + return cv::Rect(min.x, min.x, max.x - min.x, max.y - min.y); + } + + int median; + + bool operator<(const Edge & other) const { + return median < other.median; + } + + std::vector edges; + cv::Point min; + cv::Point max; + + int a; + int b; + +#ifdef DEBUG + cv::Mat a_mask; + cv::Mat b_mask; +#endif +}; + +#endif + diff --git a/tree/src/tree.cpp b/tree/src/tree.cpp new file mode 100644 index 0000000..56f5b7c --- /dev/null +++ b/tree/src/tree.cpp @@ -0,0 +1,266 @@ +#define DEBUG 1 + +#include "CVBoostConverter.hpp" +#include +#include +#include +#include "edge.h" + +using namespace boost::python; + + +class AdjacencyMatrix : public std::vector { +public: + AdjacencyMatrix(int n) { + this->n = n; + resize((n + 1)*n/2); + } + + Edge& get(int i, int j) { + int tmp = i > j ? j : i; + j = i > j ? i : j; + i = tmp; + int ind = index(i, j); + return operator[](ind); + } + +protected: + int n; + + int index(int i, int j) { + return (n * i) + j - ((i * (i+1)) / 2); + } +}; + +void updateSurface(cv::Point p, int s, std::unordered_map> & surfaces, cv::Size size) { + cv::Point p1, p2; + auto it = surfaces.find(s); + if (it != surfaces.end()) { + p1 = it->second.first; + p2 = it->second.second; + } + else { + p1 = cv::Point(size.width, size.height); + p2 = cv::Point(0, 0); + } + cv::Point minp = cv::Point(p1.x < p.x ? p1.x : p.x, p1.y < p.y ? p1.y : p.y); + cv::Point maxp = cv::Point(p2.x > p.x ? p2.x : p.x, p2.y > p.y ? p2.y : p.y); + surfaces[s] = {minp, maxp}; +} + +cv::Mat makeTree(cv::Mat s, cv::Mat e) { + if (s.type() != CV_32SC1) { + std::cerr << "Input matrix should be 32 bit integer." << std::endl; + return cv::Mat::zeros(10,10,CV_8UC1); + } + + double n = 0; + cv::minMaxLoc(s, nullptr, &n); + cv::Mat edges = cv::Mat::zeros(s.size(), CV_8UC1); + AdjacencyMatrix adjacency(n); + std::unordered_map> surfaces; + + cv::Mat nonzero; + cv::findNonZero(s == -1, nonzero); + for (int i = 0; i < nonzero.total(); i++) { + cv::Point p = nonzero.at(i); + + if (s.at(p.y-1, p.x) > 0 && s.at(p.y+1, p.x) > 0 && + s.at(p.y-1, p.x) != s.at(p.y+1, p.x)) { + edges.at(p.y, p.x) = 255; + + int a = s.at(p.y-1, p.x); + int b = s.at(p.y+1, p.x); + + updateSurface(p, a, surfaces, s.size()); + updateSurface(p, b, surfaces, s.size()); + + Edge & c = adjacency.get(a, b); + c.edges.push_back(e.at(p)); + c.updateBox(p); + } + else if (s.at(p.y, p.x - 1) > 0 && s.at(p.y, p.x + 1) > 0 && + s.at(p.y, p.x - 1) != s.at(p.y, p.x + 1)) { + edges.at(p.y, p.x) = 255; + + int a = s.at(p.y, p.x-1); + int b = s.at(p.y, p.x+1); + + updateSurface(p, a, surfaces, s.size()); + updateSurface(p, b, surfaces, s.size()); + + Edge & c = adjacency.get(a, b); + c.edges.push_back(e.at(p)); + c.updateBox(p); + } + } + + int max_id = 0; + std::multiset connections; + for (int i = 1; i < n; i++) { + for (int j = i + 1; j < n; j++) { + Edge & c = adjacency.get(i, j); + if (c.edges.size()) { + c.a = i; + c.b = j; + +#ifdef DEBUG + c.a_mask = s == c.a; + c.b_mask = s == c.b; +#endif + + c.calcMedian(); + connections.insert(c); + max_id = i > max_id ? i : max_id; + max_id = j > max_id ? j : max_id; + } + } + } + + /*for (auto it = connections.begin(); it != connections.end(); ++it) { + std::cout << "connection: a: " << it->a << " b: " << it->b << " median: " << it->median << std::endl; + }*/ + + while (connections.size() != 0) { + Edge removal = *connections.begin(); + + connections.erase(connections.begin()); + max_id++; + + cv::Point minp1 = surfaces[removal.a].first; + cv::Point maxp1 = surfaces[removal.a].second; + cv::Point minp2 = surfaces[removal.b].first; + cv::Point maxp2 = surfaces[removal.b].second; + surfaces[max_id] = {cv::Point(minp1.x < minp2.x ? minp1.x : minp2.x, minp1.y < minp2.y ? minp1.y : minp2.y), + cv::Point(maxp1.x > maxp2.x ? maxp1.x : maxp2.x, maxp1.y > maxp2.y ? maxp1.y : maxp2.y)}; + +#ifdef DEBUG + std::cout << "removing: a: " << removal.a << " b: " << removal.b << " median: " << removal.median << std::endl; + for (auto edge: removal.edges) + std::cout << int(edge) << ", "; + std::cout << std::endl; + + cv::Mat mask = removal.a_mask + removal.b_mask; + std::cout << "merging <" << removal.a << ", " << removal.b << ">; surface: <" << surfaces[max_id].first << ", " << surfaces[max_id].second << ">" << std::endl; + cv::Mat draw, rgb_mask; + cv::cvtColor(e, draw, cv::COLOR_GRAY2RGB); + cv::cvtColor(mask, rgb_mask, cv::COLOR_GRAY2RGB); + cv::addWeighted(draw, 0.5, rgb_mask, 0.5, 0, draw); + cv::rectangle(draw, surfaces[max_id].first, surfaces[max_id].second, cv::Scalar(255, 0, 0)); + cv::imshow("Edge", draw); + cv::waitKey(); +#endif + + if (connections.size() == 0) + break; + + std::vector add_list; + std::vector::iterator> remove_list; + std::unordered_map neighbours; + + for (auto it = connections.begin(); it != connections.end(); ++it) { + bool conn_a = it->a == removal.a || it->a == removal.b; + bool conn_b = it->b == removal.a || it->b == removal.b; + + if (conn_a || conn_b) { + remove_list.push_back(it); + + Edge c = *it; + if (conn_a) { + c.a = max_id; +#ifdef DEBUG + c.a_mask = mask; +#endif + } + if (conn_b) { + c.b = max_id; +#ifdef DEBUG + c.b_mask = mask; +#endif + } + + int nid = conn_a ? c.b : c.a; + auto nit = neighbours.find(nid); + if (nit == neighbours.end()) { + neighbours.insert({nid, c}); + } else { + std::vector edges; + edges.reserve(c.edges.size() + nit->second.edges.size()); + std::merge(c.edges.begin(), c.edges.end(), nit->second.edges.begin(), nit->second.edges.end(), std::back_inserter(edges)); + + neighbours.erase(nit); + c.edges = edges; + c.calcMedian(); + add_list.push_back(c); + } + } + } + + for (auto it = remove_list.rbegin(); it != remove_list.rend(); ++it) + connections.erase(*it); + for (auto c: add_list) + connections.insert(c); + for (auto n: neighbours) + connections.insert(n.second); + } + + cv::Mat result(surfaces.size(), 4, CV_32SC1); + int i = 0; + for (auto sur: surfaces) { + result.at(i++) = sur.second.first; + result.at(i++) = sur.second.second; + } + + return result; +} + +static void init_ar() +{ + Py_Initialize(); + import_array(); +} + +BOOST_PYTHON_MODULE(segmentation_tree) +{ + init_ar(); + + //initialize converters + to_python_converter(); + bcvt::matFromNDArrayBoostConverter(); + + def("tree", makeTree); +} + +int main(int argc, char * argv[]) { + if (argc != 3) { + std::cout << "Please use as ./seg_tree " << std::endl; + return 0; + } + cv::Mat segmentation = cv::imread(argv[1], cv::IMREAD_UNCHANGED); + segmentation.convertTo(segmentation, CV_32SC1); + cv::Mat edge = cv::imread(argv[2], cv::IMREAD_UNCHANGED); + + cv::Mat nonzero; + cv::findNonZero(segmentation == (1 << 16) - 1, nonzero); + for (int i = 0; i < nonzero.total(); i++) { + cv::Point p = nonzero.at(i); + segmentation.at(p) = -1; + } + + cv::namedWindow("Segmentation", cv::WINDOW_NORMAL); + cv::namedWindow("Edge", cv::WINDOW_NORMAL); + + cv::imshow("Segmentation", segmentation); + cv::imshow("Edge", edge); + + std::clock_t begin = std::clock(); + cv::Mat tree = makeTree(segmentation, edge); + std::clock_t end = std::clock(); + std::cout << tree.rows << " surfaces detected." << std::endl; + double elapsed_secs = double(end - begin) / CLOCKS_PER_SEC; + std::cout << "Times passed in seconds: " << elapsed_secs << std::endl; + + cv::waitKey(); + return 0; +} diff --git a/tree/tree copy.cpp b/tree/tree copy.cpp new file mode 100644 index 0000000..0483ad4 --- /dev/null +++ b/tree/tree copy.cpp @@ -0,0 +1,271 @@ +#include +#include + +//#define DEBUG 1 + +class Connection { +public: + Connection() : a(0), b(0), median(0) {} + Connection(int a, int b, std::vector edges) : + a(a), b(b), edges(edges) {} + Connection(int a, int b, std::vector edges, bool compute) : + a(a), b(b), edges(edges) + { + if (compute) calcMedian(); + } + + int calcMedian() { + std::sort(edges.begin(), edges.end()); + median = edges[edges.size()/2]; + return median; + } + + void updateBox(cv::Point p) { + min.x = min.x < p.x ? min.x : p.x; + min.y = min.y < p.y ? min.y : p.y; + max.x = max.x > p.x ? max.x : p.x; + max.y = max.y > p.y ? max.y : p.y; + } + + cv::Rect getRect() { + return cv::Rect(min.x, min.x, max.x - min.x, max.y - min.y); + } + + int median; + + bool operator<(const Connection & other) const { + return median < other.median; + } + + std::vector edges; + cv::Point min; + cv::Point max; + + int a; + int b; + +#ifdef DEBUG + cv::Mat a_mask; + cv::Mat b_mask; +#endif +}; + +class AdjacencyMatrix: std::vector { +public: + AdjacencyMatrix(int n) { + this->n = n; + resize((n + 1)*n/2); + } + + Connection& get(int i, int j) { + int tmp = i > j ? j : i; + j = i > j ? i : j; + i = tmp; + int ind = index(i, j); + return operator[](ind); + } + +protected: + int n; + + int index(int i, int j) { + return (n * i) + j - ((i * (i+1)) / 2); + } +}; + +void updateSurface(cv::Point p, int s, std::unordered_map> & surfaces, cv::Size size) { + cv::Point p1, p2; + auto it = surfaces.find(s); + if (it != surfaces.end()) { + p1 = it->second.first; + p2 = it->second.second; + } + else { + p1 = cv::Point(size.width, size.height); + p2 = cv::Point(0, 0); + } + cv::Point minp = cv::Point(p1.x < p.x ? p1.x : p.x, p1.y < p.y ? p1.y : p.y); + cv::Point maxp = cv::Point(p2.x > p.x ? p2.x : p.x, p2.y > p.y ? p2.y : p.y); + surfaces[s] = {minp, maxp}; +} + +void makeTree(cv::Mat s, cv::Mat e) { + int n = 255; + //cv::Mat edges = cv::Mat::zeros(s.size(), CV_8UC1); + AdjacencyMatrix adjacency(n); + std::unordered_map> surfaces; + + cv::Mat nonzero; + cv::findNonZero(s == 0, nonzero); + for (int i = 0; i < nonzero.total(); i++) { + cv::Point p = nonzero.at(i); + + if (s.at(p.y-1, p.x) != 255 && s.at(p.y+1, p.x) != 255 && + s.at(p.y-1, p.x) != 0 && s.at(p.y+1, p.x) != 0 && + s.at(p.y-1, p.x) != s.at(p.y+1, p.x)) { + //edges.at(p.y, p.x) = 255; + + int a = s.at(p.y-1, p.x); + int b = s.at(p.y+1, p.x); + + updateSurface(p, a, surfaces, s.size()); + updateSurface(p, b, surfaces, s.size()); + + Connection & c = adjacency.get(a, b); + c.edges.push_back(e.at(p)); + c.updateBox(p); + } + else if (s.at(p.y, p.x - 1) != 255 && s.at(p.y, p.x + 1) != 255 && + s.at(p.y, p.x - 1) != 0 && s.at(p.y, p.x + 1) != 0 && + s.at(p.y, p.x - 1) != s.at(p.y, p.x + 1)) { + //edges.at(p.y, p.x) = 255; + + int a = s.at(p.y, p.x-1); + int b = s.at(p.y, p.x+1); + + updateSurface(p, a, surfaces, s.size()); + updateSurface(p, b, surfaces, s.size()); + + Connection & c = adjacency.get(a, b); + c.edges.push_back(e.at(p)); + c.updateBox(p); + } + } + + int max_id = 0; + std::multiset connections; + for (int i = 1; i < n; i++) { + for (int j = i + 1; j < n; j++) { + Connection & c = adjacency.get(i, j); + if (c.edges.size()) { + c.a = i; + c.b = j; + +#ifdef DEBUG + c.a_mask = s == c.a; + c.b_mask = s == c.b; +#endif + + c.calcMedian(); + connections.insert(c); + max_id = i > max_id ? i : max_id; + max_id = j > max_id ? j : max_id; + } + } + } + + /*for (auto it = connections.begin(); it != connections.end(); ++it) { + std::cout << "connection: a: " << it->a << " b: " << it->b << " median: " << it->median << std::endl; + }*/ + + while (connections.size() != 0) { + Connection removal = *connections.begin(); + + connections.erase(connections.begin()); + max_id++; + + cv::Point minp1 = surfaces[removal.a].first; + cv::Point maxp1 = surfaces[removal.a].second; + cv::Point minp2 = surfaces[removal.b].first; + cv::Point maxp2 = surfaces[removal.b].second; + surfaces[max_id] = {cv::Point(minp1.x < minp2.x ? minp1.x : minp2.x, minp1.y < minp2.y ? minp1.y : minp2.y), + cv::Point(maxp1.x > maxp2.x ? maxp1.x : maxp2.x, maxp1.y > maxp2.y ? maxp1.y : maxp2.y)}; + +#ifdef DEBUG + std::cout << "removing: a: " << removal.a << " b: " << removal.b << " median: " << removal.median << std::endl; + + cv::Mat mask = removal.a_mask + removal.b_mask; + std::cout << "merging <" << removal.a << ", " << removal.b << ">; surface: <" << surfaces[max_id].first << ", " << surfaces[max_id].second << ">" << std::endl; + cv::Mat draw, rgb_mask; + cv::cvtColor(e, draw, cv::COLOR_GRAY2RGB); + cv::cvtColor(mask, rgb_mask, cv::COLOR_GRAY2RGB); + cv::addWeighted(draw, 0.5, rgb_mask, 0.5, 0, draw); + cv::rectangle(draw, surfaces[max_id].first, surfaces[max_id].second, cv::Scalar(255, 0, 0)); + cv::imshow("Edge", draw); + cv::waitKey(); +#endif + + if (connections.size() == 0) + break; + + std::vector add_list; + std::vector::iterator> remove_list; + std::unordered_map neighbours; + + for (auto it = connections.begin(); it != connections.end(); ++it) { + bool conn_a = it->a == removal.a || it->a == removal.b; + bool conn_b = it->b == removal.a || it->b == removal.b; + + if (conn_a || conn_b) { + remove_list.push_back(it); + + Connection c = *it; + if (conn_a) { + c.a = max_id; +#ifdef DEBUG + c.a_mask = mask; +#endif + } + if (conn_b) { + c.b = max_id; +#ifdef DEBUG + c.b_mask = mask; +#endif + } + + int nid = conn_a ? c.b : c.a; + auto nit = neighbours.find(nid); + if (nit == neighbours.end()) { + neighbours.insert({nid, c}); + } else { + std::vector edges; + edges.reserve(c.edges.size() + nit->second.edges.size()); + std::merge(c.edges.begin(), c.edges.end(), nit->second.edges.begin(), nit->second.edges.end(), std::back_inserter(edges)); + + neighbours.erase(nit); + c.edges = edges; + c.calcMedian(); + add_list.push_back(c); + } + } + } + + for (auto it = remove_list.rbegin(); it != remove_list.rend(); ++it) + connections.erase(*it); + for (auto c: add_list) + connections.insert(c); + for (auto n: neighbours) + connections.insert(n.second); + } + + std::cout << "size: " << surfaces.size() << std::endl; + + /*for (auto sur: surfaces) { + std::cout << "surface: " << sur.first << " rect: <" << sur.second.first << ", " << sur.second.second << ">" << std::endl; + cv::Mat draw; + s.copyTo(draw); + cv::rectangle(draw, sur.second.first, sur.second.second, cv::Scalar(255)); + cv::imshow("Segmentation", draw); + cv::waitKey(); + }*/ +} + +int main(int argc, char * argv[]) { + cv::Mat segmentation = cv::imread("../segmentation.png", cv::IMREAD_GRAYSCALE); + cv::Mat edge = cv::imread("../edge.png", cv::IMREAD_GRAYSCALE); + + cv::namedWindow("Segmentation", cv::WINDOW_NORMAL); + cv::namedWindow("Edge", cv::WINDOW_NORMAL); + + cv::imshow("Segmentation", segmentation); + cv::imshow("Edge", edge); + + std::clock_t begin = std::clock(); + makeTree(segmentation, edge); + std::clock_t end = std::clock(); + double elapsed_secs = double(end - begin) / CLOCKS_PER_SEC; + std::cout << "Times passed in seconds: " << elapsed_secs << std::endl; + + cv::waitKey(); + return 0; +} \ No newline at end of file