diff options
author | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-06-30 06:43:16 +0000 |
---|---|---|
committer | pdlotko <pdlotko@636b058d-ea47-450e-bf9e-a15bfbe3eedb> | 2016-06-30 06:43:16 +0000 |
commit | 689c18ab64d0ee31a57b1e7b7bf123442eb58b5c (patch) | |
tree | dfbc32b5bbc5592eef90706863193e9d1362c835 /src/Gudhi_stat | |
parent | ded5c5533b97fba238cec7be095c53e719a3665c (diff) |
adding examples
git-svn-id: svn+ssh://scm.gforge.inria.fr/svnroot/gudhi/branches/gudhi_stat@1356 636b058d-ea47-450e-bf9e-a15bfbe3eedb
Former-commit-id: 1d703c8d0f03db43dd6f6b03e7ca3aff49c89756
Diffstat (limited to 'src/Gudhi_stat')
18 files changed, 105 insertions, 303 deletions
diff --git a/src/Gudhi_stat/example/CMakeFiles/CMakeDirectoryInformation.cmake b/src/Gudhi_stat/example/CMakeFiles/CMakeDirectoryInformation.cmake deleted file mode 100644 index 1d79e180..00000000 --- a/src/Gudhi_stat/example/CMakeFiles/CMakeDirectoryInformation.cmake +++ /dev/null @@ -1,16 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 2.8 - -# Relative path conversion top directories. -SET(CMAKE_RELATIVE_PATH_TOP_SOURCE "/home/pawel/Dropbox/gudhi/gudhi_stat") -SET(CMAKE_RELATIVE_PATH_TOP_BINARY "/home/pawel/Dropbox/gudhi/gudhi_stat") - -# Force unix paths in dependencies. -SET(CMAKE_FORCE_UNIX_PATHS 1) - - -# The C and CXX include file regular expressions for this directory. -SET(CMAKE_C_INCLUDE_REGEX_SCAN "^.*$") -SET(CMAKE_C_INCLUDE_REGEX_COMPLAIN "^$") -SET(CMAKE_CXX_INCLUDE_REGEX_SCAN ${CMAKE_C_INCLUDE_REGEX_SCAN}) -SET(CMAKE_CXX_INCLUDE_REGEX_COMPLAIN ${CMAKE_C_INCLUDE_REGEX_COMPLAIN}) diff --git a/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/CXX.includecache b/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/CXX.includecache deleted file mode 100644 index 970931e1..00000000 --- a/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/CXX.includecache +++ /dev/null @@ -1,70 +0,0 @@ -#IncludeRegexLine: ^[ ]*#[ ]*(include|import)[ ]*[<"]([^">]+)([">]) - -#IncludeRegexScan: ^.*$ - -#IncludeRegexComplain: ^$ - -#IncludeRegexTransform: - -/home/pawel/Dropbox/gudhi/gudhi_stat/src/Gudhi_stat/example/persistence_landscape.cpp -gudhi/abstract_classes/Abs_Topological_data.h -- -gudhi/concretizations/Persistence_landscapes.h -- -iostream -- - -src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Real_valued_topological_data.h -gudhi/abstract_classes/Abs_Topological_data.h -- - -src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data.h - -src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_averages.h -gudhi/abstract_classes/Abs_Topological_data.h -- - -src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_distances.h -Abs_Topological_data.h -src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data.h - -src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_scalar_product.h -gudhi/abstract_classes/Abs_Topological_data.h -- - -src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Vectorized_topological_data.h -gudhi/abstract_classes/Abs_Topological_data.h -- -Abs_Topological_data.h -src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data.h -vector -- - -src/Gudhi_stat/include/gudhi/concretizations/Persistence_landscapes.h -cmath -- -iostream -- -vector -- -limits -- -fstream -- -sstream -- -algorithm -- -unistd.h -- -gudhi/abstract_classes/Abs_Vectorized_topological_data.h -- -gudhi/abstract_classes/Abs_Topological_data_with_averages.h -- -gudhi/abstract_classes/Abs_Topological_data_with_distances.h -- -gudhi/abstract_classes/Abs_Real_valued_topological_data.h -- -gudhi/abstract_classes/Abs_Topological_data_with_scalar_product.h -- - diff --git a/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/DependInfo.cmake b/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/DependInfo.cmake deleted file mode 100644 index 9504550a..00000000 --- a/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/DependInfo.cmake +++ /dev/null @@ -1,43 +0,0 @@ -# The set of languages for which implicit dependencies are needed: -SET(CMAKE_DEPENDS_LANGUAGES - "CXX" - ) -# The set of files for implicit dependencies of each language: -SET(CMAKE_DEPENDS_CHECK_CXX - "/home/pawel/Dropbox/gudhi/gudhi_stat/src/Gudhi_stat/example/persistence_landscape.cpp" "/home/pawel/Dropbox/gudhi/gudhi_stat/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o" - ) -SET(CMAKE_CXX_COMPILER_ID "GNU") - -# Preprocessor definitions for this target. -SET(CMAKE_TARGET_DEFINITIONS - "BOOST_ALL_NO_LIB" - "BOOST_RESULT_OF_USE_DECLTYPE" - "CGAL_USE_GMP" - "CGAL_USE_GMPXX" - "CGAL_USE_MPFR" - ) - -# Targets to which this target links. -SET(CMAKE_TARGET_LINKED_INFO_FILES - ) - -# The include file search paths: -SET(CMAKE_C_TARGET_INCLUDE_PATH - "/usr/include/x86_64-linux-gnu" - "." - "/usr/local/include" - "src/common/include" - "src/Alpha_complex/include" - "src/Bitmap_cubical_complex/include" - "src/Bottleneck/include" - "src/Contraction/include" - "src/Hasse_complex/include" - "src/Persistent_cohomology/include" - "src/Simplex_tree/include" - "src/Skeleton_blocker/include" - "src/Witness_complex/include" - "src/Gudhi_stat/include" - ) -SET(CMAKE_CXX_TARGET_INCLUDE_PATH ${CMAKE_C_TARGET_INCLUDE_PATH}) -SET(CMAKE_Fortran_TARGET_INCLUDE_PATH ${CMAKE_C_TARGET_INCLUDE_PATH}) -SET(CMAKE_ASM_TARGET_INCLUDE_PATH ${CMAKE_C_TARGET_INCLUDE_PATH}) diff --git a/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/build.make b/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/build.make deleted file mode 100644 index 9c4b5673..00000000 --- a/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/build.make +++ /dev/null @@ -1,111 +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/bin/cmake - -# The command to remove a file. -RM = /usr/bin/cmake -E remove -f - -# Escaping for special characters. -EQUALS = = - -# The top-level source directory on which CMake was run. -CMAKE_SOURCE_DIR = /home/pawel/Dropbox/gudhi/gudhi_stat - -# The top-level build directory on which CMake was run. -CMAKE_BINARY_DIR = /home/pawel/Dropbox/gudhi/gudhi_stat - -# Include any dependencies generated for this target. -include src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/depend.make - -# Include the progress variables for this target. -include src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/progress.make - -# Include the compile flags for this target's objects. -include src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/flags.make - -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o: src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/flags.make -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o: src/Gudhi_stat/example/persistence_landscape.cpp - $(CMAKE_COMMAND) -E cmake_progress_report /home/pawel/Dropbox/gudhi/gudhi_stat/CMakeFiles $(CMAKE_PROGRESS_1) - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Building CXX object src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o" - cd /home/pawel/Dropbox/gudhi/gudhi_stat/src/Gudhi_stat/example && /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -o CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o -c /home/pawel/Dropbox/gudhi/gudhi_stat/src/Gudhi_stat/example/persistence_landscape.cpp - -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.i: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.i" - cd /home/pawel/Dropbox/gudhi/gudhi_stat/src/Gudhi_stat/example && /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -E /home/pawel/Dropbox/gudhi/gudhi_stat/src/Gudhi_stat/example/persistence_landscape.cpp > CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.i - -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.s: cmake_force - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.s" - cd /home/pawel/Dropbox/gudhi/gudhi_stat/src/Gudhi_stat/example && /usr/bin/c++ $(CXX_DEFINES) $(CXX_FLAGS) -S /home/pawel/Dropbox/gudhi/gudhi_stat/src/Gudhi_stat/example/persistence_landscape.cpp -o CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.s - -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o.requires: -.PHONY : src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o.requires - -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o.provides: src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o.requires - $(MAKE) -f src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/build.make src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o.provides.build -.PHONY : src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o.provides - -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o.provides.build: src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o - -# Object files for target persistence_landscape -persistence_landscape_OBJECTS = \ -"CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o" - -# External object files for target persistence_landscape -persistence_landscape_EXTERNAL_OBJECTS = - -src/Gudhi_stat/example/persistence_landscape: src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o -src/Gudhi_stat/example/persistence_landscape: src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/build.make -src/Gudhi_stat/example/persistence_landscape: /usr/lib/x86_64-linux-gnu/libmpfr.so -src/Gudhi_stat/example/persistence_landscape: /usr/lib/x86_64-linux-gnu/libgmpxx.so -src/Gudhi_stat/example/persistence_landscape: /usr/lib/x86_64-linux-gnu/libgmp.so -src/Gudhi_stat/example/persistence_landscape: /usr/local/lib/libCGAL.so.11.0.1 -src/Gudhi_stat/example/persistence_landscape: /usr/lib/x86_64-linux-gnu/libboost_thread.so -src/Gudhi_stat/example/persistence_landscape: /usr/lib/x86_64-linux-gnu/libboost_system.so -src/Gudhi_stat/example/persistence_landscape: /usr/lib/x86_64-linux-gnu/libpthread.so -src/Gudhi_stat/example/persistence_landscape: /usr/lib/x86_64-linux-gnu/libboost_system.so -src/Gudhi_stat/example/persistence_landscape: /usr/lib/x86_64-linux-gnu/libpthread.so -src/Gudhi_stat/example/persistence_landscape: src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/link.txt - @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --red --bold "Linking CXX executable persistence_landscape" - cd /home/pawel/Dropbox/gudhi/gudhi_stat/src/Gudhi_stat/example && $(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/persistence_landscape.dir/link.txt --verbose=$(VERBOSE) - -# Rule to build all files generated by this target. -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/build: src/Gudhi_stat/example/persistence_landscape -.PHONY : src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/build - -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/requires: src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o.requires -.PHONY : src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/requires - -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/clean: - cd /home/pawel/Dropbox/gudhi/gudhi_stat/src/Gudhi_stat/example && $(CMAKE_COMMAND) -P CMakeFiles/persistence_landscape.dir/cmake_clean.cmake -.PHONY : src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/clean - -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/depend: - cd /home/pawel/Dropbox/gudhi/gudhi_stat && $(CMAKE_COMMAND) -E cmake_depends "Unix Makefiles" /home/pawel/Dropbox/gudhi/gudhi_stat /home/pawel/Dropbox/gudhi/gudhi_stat/src/Gudhi_stat/example /home/pawel/Dropbox/gudhi/gudhi_stat /home/pawel/Dropbox/gudhi/gudhi_stat/src/Gudhi_stat/example /home/pawel/Dropbox/gudhi/gudhi_stat/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/DependInfo.cmake --color=$(COLOR) -.PHONY : src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/depend - diff --git a/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/cmake_clean.cmake b/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/cmake_clean.cmake deleted file mode 100644 index 269bce73..00000000 --- a/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/cmake_clean.cmake +++ /dev/null @@ -1,10 +0,0 @@ -FILE(REMOVE_RECURSE - "CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o" - "persistence_landscape.pdb" - "persistence_landscape" -) - -# Per-language clean rules from dependency scanning. -FOREACH(lang CXX) - INCLUDE(CMakeFiles/persistence_landscape.dir/cmake_clean_${lang}.cmake OPTIONAL) -ENDFOREACH(lang) diff --git a/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/depend.internal b/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/depend.internal deleted file mode 100644 index 5b14b7f8..00000000 --- a/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/depend.internal +++ /dev/null @@ -1,12 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 2.8 - -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o - /home/pawel/Dropbox/gudhi/gudhi_stat/src/Gudhi_stat/example/persistence_landscape.cpp - src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Real_valued_topological_data.h - src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data.h - src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_averages.h - src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_distances.h - src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_scalar_product.h - src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Vectorized_topological_data.h - src/Gudhi_stat/include/gudhi/concretizations/Persistence_landscapes.h diff --git a/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/depend.make b/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/depend.make deleted file mode 100644 index aebc084b..00000000 --- a/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/depend.make +++ /dev/null @@ -1,12 +0,0 @@ -# CMAKE generated file: DO NOT EDIT! -# Generated by "Unix Makefiles" Generator, CMake Version 2.8 - -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o: src/Gudhi_stat/example/persistence_landscape.cpp -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o: src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Real_valued_topological_data.h -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o: src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data.h -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o: src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_averages.h -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o: src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_distances.h -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o: src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Topological_data_with_scalar_product.h -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o: src/Gudhi_stat/include/gudhi/abstract_classes/Abs_Vectorized_topological_data.h -src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o: src/Gudhi_stat/include/gudhi/concretizations/Persistence_landscapes.h - diff --git a/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/flags.make b/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/flags.make deleted file mode 100644 index 8bae1745..00000000 --- a/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.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 = -frounding-math -std=c++11 -Wall -Wpedantic -Wsign-compare -O3 -DNDEBUG -isystem /usr/include/x86_64-linux-gnu -I/home/pawel/Dropbox/gudhi/gudhi_stat -I/usr/local/include -I/home/pawel/Dropbox/gudhi/gudhi_stat/src/common/include -I/home/pawel/Dropbox/gudhi/gudhi_stat/src/Alpha_complex/include -I/home/pawel/Dropbox/gudhi/gudhi_stat/src/Bitmap_cubical_complex/include -I/home/pawel/Dropbox/gudhi/gudhi_stat/src/Bottleneck/include -I/home/pawel/Dropbox/gudhi/gudhi_stat/src/Contraction/include -I/home/pawel/Dropbox/gudhi/gudhi_stat/src/Hasse_complex/include -I/home/pawel/Dropbox/gudhi/gudhi_stat/src/Persistent_cohomology/include -I/home/pawel/Dropbox/gudhi/gudhi_stat/src/Simplex_tree/include -I/home/pawel/Dropbox/gudhi/gudhi_stat/src/Skeleton_blocker/include -I/home/pawel/Dropbox/gudhi/gudhi_stat/src/Witness_complex/include -I/home/pawel/Dropbox/gudhi/gudhi_stat/src/Gudhi_stat/include - -CXX_DEFINES = -DBOOST_ALL_NO_LIB -DBOOST_RESULT_OF_USE_DECLTYPE -DCGAL_USE_GMP -DCGAL_USE_GMPXX -DCGAL_USE_MPFR - diff --git a/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/link.txt b/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/link.txt deleted file mode 100644 index 5f4e7327..00000000 --- a/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/link.txt +++ /dev/null @@ -1 +0,0 @@ -/usr/bin/c++ -frounding-math -std=c++11 -Wall -Wpedantic -Wsign-compare -O3 -DNDEBUG CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.o -o persistence_landscape -L/usr/local/lib -rdynamic -lmpfr -lgmpxx -lgmp /usr/local/lib/libCGAL.so.11.0.1 -lboost_thread -lboost_system -lpthread -lboost_system -lpthread -Wl,-rpath,/usr/local/lib diff --git a/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/progress.make b/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/progress.make deleted file mode 100644 index 044b5ab3..00000000 --- a/src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/progress.make +++ /dev/null @@ -1,2 +0,0 @@ -CMAKE_PROGRESS_1 = 32 - diff --git a/src/Gudhi_stat/example/CMakeFiles/progress.marks b/src/Gudhi_stat/example/CMakeFiles/progress.marks deleted file mode 100644 index d00491fd..00000000 --- a/src/Gudhi_stat/example/CMakeFiles/progress.marks +++ /dev/null @@ -1 +0,0 @@ -1 diff --git a/src/Gudhi_stat/example/CMakeLists.txt b/src/Gudhi_stat/example/CMakeLists.txt index 64f4ba55..ec2afc09 100644 --- a/src/Gudhi_stat/example/CMakeLists.txt +++ b/src/Gudhi_stat/example/CMakeLists.txt @@ -4,3 +4,11 @@ project(GUDHI_STAT) add_executable ( persistence_landscape persistence_landscape.cpp ) target_link_libraries(persistence_landscape ${Boost_SYSTEM_LIBRARY}) + +add_executable ( persistence_intervals persistence_intervals.cpp ) +target_link_libraries(persistence_intervals ${Boost_SYSTEM_LIBRARY}) + + +add_executable ( vector_representation vector_representation.cpp ) +target_link_libraries(vector_representation ${Boost_SYSTEM_LIBRARY}) + diff --git a/src/Gudhi_stat/example/CTestTestfile.cmake b/src/Gudhi_stat/example/CTestTestfile.cmake deleted file mode 100644 index bd1edcc0..00000000 --- a/src/Gudhi_stat/example/CTestTestfile.cmake +++ /dev/null @@ -1,6 +0,0 @@ -# CMake generated Testfile for -# Source directory: /home/pawel/Dropbox/gudhi/gudhi_stat/src/Gudhi_stat/example -# Build directory: /home/pawel/Dropbox/gudhi/gudhi_stat/src/Gudhi_stat/example -# -# This file includes the relevant testing commands required for -# testing this directory and lists subdirectories to be tested as well. diff --git a/src/Gudhi_stat/example/Makefile b/src/Gudhi_stat/example/Makefile index f876c1b3..523396e5 100644 --- a/src/Gudhi_stat/example/Makefile +++ b/src/Gudhi_stat/example/Makefile @@ -109,6 +109,20 @@ depend: .PHONY : depend # Convenience name for target. +src/Gudhi_stat/example/CMakeFiles/persistence_intervals.dir/rule: + cd /home/pawel/Dropbox/gudhi/gudhi_stat && $(MAKE) -f CMakeFiles/Makefile2 src/Gudhi_stat/example/CMakeFiles/persistence_intervals.dir/rule +.PHONY : src/Gudhi_stat/example/CMakeFiles/persistence_intervals.dir/rule + +# Convenience name for target. +persistence_intervals: src/Gudhi_stat/example/CMakeFiles/persistence_intervals.dir/rule +.PHONY : persistence_intervals + +# fast build rule for target. +persistence_intervals/fast: + cd /home/pawel/Dropbox/gudhi/gudhi_stat && $(MAKE) -f src/Gudhi_stat/example/CMakeFiles/persistence_intervals.dir/build.make src/Gudhi_stat/example/CMakeFiles/persistence_intervals.dir/build +.PHONY : persistence_intervals/fast + +# Convenience name for target. src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/rule: cd /home/pawel/Dropbox/gudhi/gudhi_stat && $(MAKE) -f CMakeFiles/Makefile2 src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/rule .PHONY : src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/rule @@ -122,6 +136,44 @@ persistence_landscape/fast: cd /home/pawel/Dropbox/gudhi/gudhi_stat && $(MAKE) -f src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/build.make src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/build .PHONY : persistence_landscape/fast +# Convenience name for target. +src/Gudhi_stat/example/CMakeFiles/vector_representation.dir/rule: + cd /home/pawel/Dropbox/gudhi/gudhi_stat && $(MAKE) -f CMakeFiles/Makefile2 src/Gudhi_stat/example/CMakeFiles/vector_representation.dir/rule +.PHONY : src/Gudhi_stat/example/CMakeFiles/vector_representation.dir/rule + +# Convenience name for target. +vector_representation: src/Gudhi_stat/example/CMakeFiles/vector_representation.dir/rule +.PHONY : vector_representation + +# fast build rule for target. +vector_representation/fast: + cd /home/pawel/Dropbox/gudhi/gudhi_stat && $(MAKE) -f src/Gudhi_stat/example/CMakeFiles/vector_representation.dir/build.make src/Gudhi_stat/example/CMakeFiles/vector_representation.dir/build +.PHONY : vector_representation/fast + +persistence_intervals.o: persistence_intervals.cpp.o +.PHONY : persistence_intervals.o + +# target to build an object file +persistence_intervals.cpp.o: + cd /home/pawel/Dropbox/gudhi/gudhi_stat && $(MAKE) -f src/Gudhi_stat/example/CMakeFiles/persistence_intervals.dir/build.make src/Gudhi_stat/example/CMakeFiles/persistence_intervals.dir/persistence_intervals.cpp.o +.PHONY : persistence_intervals.cpp.o + +persistence_intervals.i: persistence_intervals.cpp.i +.PHONY : persistence_intervals.i + +# target to preprocess a source file +persistence_intervals.cpp.i: + cd /home/pawel/Dropbox/gudhi/gudhi_stat && $(MAKE) -f src/Gudhi_stat/example/CMakeFiles/persistence_intervals.dir/build.make src/Gudhi_stat/example/CMakeFiles/persistence_intervals.dir/persistence_intervals.cpp.i +.PHONY : persistence_intervals.cpp.i + +persistence_intervals.s: persistence_intervals.cpp.s +.PHONY : persistence_intervals.s + +# target to generate assembly for a file +persistence_intervals.cpp.s: + cd /home/pawel/Dropbox/gudhi/gudhi_stat && $(MAKE) -f src/Gudhi_stat/example/CMakeFiles/persistence_intervals.dir/build.make src/Gudhi_stat/example/CMakeFiles/persistence_intervals.dir/persistence_intervals.cpp.s +.PHONY : persistence_intervals.cpp.s + persistence_landscape.o: persistence_landscape.cpp.o .PHONY : persistence_landscape.o @@ -146,6 +198,30 @@ persistence_landscape.cpp.s: cd /home/pawel/Dropbox/gudhi/gudhi_stat && $(MAKE) -f src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/build.make src/Gudhi_stat/example/CMakeFiles/persistence_landscape.dir/persistence_landscape.cpp.s .PHONY : persistence_landscape.cpp.s +vector_representation.o: vector_representation.cpp.o +.PHONY : vector_representation.o + +# target to build an object file +vector_representation.cpp.o: + cd /home/pawel/Dropbox/gudhi/gudhi_stat && $(MAKE) -f src/Gudhi_stat/example/CMakeFiles/vector_representation.dir/build.make src/Gudhi_stat/example/CMakeFiles/vector_representation.dir/vector_representation.cpp.o +.PHONY : vector_representation.cpp.o + +vector_representation.i: vector_representation.cpp.i +.PHONY : vector_representation.i + +# target to preprocess a source file +vector_representation.cpp.i: + cd /home/pawel/Dropbox/gudhi/gudhi_stat && $(MAKE) -f src/Gudhi_stat/example/CMakeFiles/vector_representation.dir/build.make src/Gudhi_stat/example/CMakeFiles/vector_representation.dir/vector_representation.cpp.i +.PHONY : vector_representation.cpp.i + +vector_representation.s: vector_representation.cpp.s +.PHONY : vector_representation.s + +# target to generate assembly for a file +vector_representation.cpp.s: + cd /home/pawel/Dropbox/gudhi/gudhi_stat && $(MAKE) -f src/Gudhi_stat/example/CMakeFiles/vector_representation.dir/build.make src/Gudhi_stat/example/CMakeFiles/vector_representation.dir/vector_representation.cpp.s +.PHONY : vector_representation.cpp.s + # Help Target help: @echo "The following are some of the valid targets for this Makefile:" @@ -153,12 +229,20 @@ help: @echo "... clean" @echo "... depend" @echo "... edit_cache" + @echo "... persistence_intervals" @echo "... persistence_landscape" @echo "... rebuild_cache" @echo "... test" + @echo "... vector_representation" + @echo "... persistence_intervals.o" + @echo "... persistence_intervals.i" + @echo "... persistence_intervals.s" @echo "... persistence_landscape.o" @echo "... persistence_landscape.i" @echo "... persistence_landscape.s" + @echo "... vector_representation.o" + @echo "... vector_representation.i" + @echo "... vector_representation.s" .PHONY : help diff --git a/src/Gudhi_stat/include/gudhi/concretizations/Vector_distances_in_diagram.h b/src/Gudhi_stat/include/gudhi/concretizations/Vector_distances_in_diagram.h index 626c962b..bcabadac 100644 --- a/src/Gudhi_stat/include/gudhi/concretizations/Vector_distances_in_diagram.h +++ b/src/Gudhi_stat/include/gudhi/concretizations/Vector_distances_in_diagram.h @@ -375,17 +375,19 @@ void Vector_distances_in_diagram<F>::compute_average( std::vector< Abs_Topologic return; } - Vector_distances_in_diagram<F>* base = (Vector_distances_in_diagram<F>*)to_average[0]; - for ( size_t i = 1 ; i != to_average.size() ; ++i ) + size_t maximal_length_of_vector = 0; + for ( size_t i = 0 ; i != to_average.size() ; ++i ) { Vector_distances_in_diagram<F>* current = (Vector_distances_in_diagram<F>*)to_average[i]; - if ( current->sorted_vector_of_distnaces.size() != base->sorted_vector_of_distnaces.size() ) + if ( current->sorted_vector_of_distnaces.size() > maximal_length_of_vector ) { - throw "Not compatible sizes of Vector_distances_in_diagram in the method Vector_distances_in_diagram<F>::compute_average"; + maximal_length_of_vector = current->sorted_vector_of_distnaces.size(); } } - std::vector< double > av( base->sorted_vector_of_distnaces.size() , 0 ); + //cerr << "maximal_length_of_vector : " << maximal_length_of_vector << endl; + + std::vector< double > av( maximal_length_of_vector , 0 ); for ( size_t i = 0 ; i != to_average.size() ; ++i ) { Vector_distances_in_diagram<F>* current = (Vector_distances_in_diagram<F>*)to_average[i]; @@ -395,12 +397,12 @@ void Vector_distances_in_diagram<F>::compute_average( std::vector< Abs_Topologic } } - for ( size_t i = 0 ; i != to_average.size() ; ++i ) + for ( size_t i = 0 ; i != maximal_length_of_vector ; ++i ) { av[i] /= (double)to_average.size(); } - - (*this) = Vector_distances_in_diagram<F>( av ); + this->sorted_vector_of_distnaces = av; + this->where_to_cut = av.size(); } template <typename F> diff --git a/src/Gudhi_stat/test/CMakeFiles/persistence_intervals_test.dir/progress.make b/src/Gudhi_stat/test/CMakeFiles/persistence_intervals_test.dir/progress.make index a3100dd4..044b5ab3 100644 --- a/src/Gudhi_stat/test/CMakeFiles/persistence_intervals_test.dir/progress.make +++ b/src/Gudhi_stat/test/CMakeFiles/persistence_intervals_test.dir/progress.make @@ -1,2 +1,2 @@ -CMAKE_PROGRESS_1 = 31 +CMAKE_PROGRESS_1 = 32 diff --git a/src/Gudhi_stat/test/CMakeFiles/persistence_lanscapes_test.dir/progress.make b/src/Gudhi_stat/test/CMakeFiles/persistence_lanscapes_test.dir/progress.make index 51133726..49a8b316 100644 --- a/src/Gudhi_stat/test/CMakeFiles/persistence_lanscapes_test.dir/progress.make +++ b/src/Gudhi_stat/test/CMakeFiles/persistence_lanscapes_test.dir/progress.make @@ -1,2 +1,2 @@ -CMAKE_PROGRESS_1 = 33 +CMAKE_PROGRESS_1 = 34 diff --git a/src/Gudhi_stat/test/CMakeFiles/vector_representation_test.dir/progress.make b/src/Gudhi_stat/test/CMakeFiles/vector_representation_test.dir/progress.make index 109d64a8..049132e5 100644 --- a/src/Gudhi_stat/test/CMakeFiles/vector_representation_test.dir/progress.make +++ b/src/Gudhi_stat/test/CMakeFiles/vector_representation_test.dir/progress.make @@ -1,2 +1,2 @@ -CMAKE_PROGRESS_1 = 43 +CMAKE_PROGRESS_1 = 45 |