diff options
| author | Ulrich Bauer <mail@ulrich-bauer.org> | 2017-03-30 08:39:07 +0200 |
|---|---|---|
| committer | Ulrich Bauer <mail@ulrich-bauer.org> | 2017-03-30 08:39:07 +0200 |
| commit | 786f94979f88fbf495b28bd9aab50d1287d9180c (patch) | |
| tree | b3314705ccb13b89ef2b02f229f4c15903f71f91 /ripser.xcodeproj/project.pbxproj | |
| parent | 9d898b2a232580a36aa2d5588887e34fb777ab5a (diff) | |
| parent | d898ef27044bc7f10da478d16581915e95edc2c9 (diff) | |
Merge branch 'dev' into representative-cycles
* dev: (28 commits)
progress indicator
benchmark using sparsehash
updated benchmark
typo in readme
benchmark results
gudhi benchmark output
benchmark H^1
constructors fixed
code reformatting
code reformatting
reordered initializers
cleanup compressed distance matrix access
fixed move constructor
fix for missing constructor of diameter_entry_t
allow for negative edge filtration values
cleanup binomial coefficients
more code reorganization
code reorganization
moved attribute packed
don’t store diagonal in reduction matrix when not using coefficients
...
# Conflicts:
# Makefile
# ripser.cpp
# ripser.xcodeproj/project.pbxproj
Diffstat (limited to 'ripser.xcodeproj/project.pbxproj')
| -rw-r--r-- | ripser.xcodeproj/project.pbxproj | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/ripser.xcodeproj/project.pbxproj b/ripser.xcodeproj/project.pbxproj index 8703c59..3578fa0 100644 --- a/ripser.xcodeproj/project.pbxproj +++ b/ripser.xcodeproj/project.pbxproj @@ -88,7 +88,7 @@ 551018401BD63CB300990BFF /* Project object */ = { isa = PBXProject; attributes = { - LastUpgradeCheck = 0700; + LastUpgradeCheck = 0800; ORGANIZATIONNAME = "ulrich-bauer.org"; TargetAttributes = { 551018471BD63CB300990BFF = { @@ -129,7 +129,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; @@ -138,15 +138,17 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = dwarf; ENABLE_STRICT_OBJC_MSGSEND = YES; ENABLE_TESTABILITY = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_C_LANGUAGE_STANDARD = c11; GCC_DYNAMIC_NO_PIC = NO; GCC_NO_COMMON_BLOCKS = YES; GCC_OPTIMIZATION_LEVEL = 0; @@ -172,7 +174,7 @@ isa = XCBuildConfiguration; buildSettings = { ALWAYS_SEARCH_USER_PATHS = NO; - CLANG_CXX_LANGUAGE_STANDARD = "gnu++0x"; + CLANG_CXX_LANGUAGE_STANDARD = "c++0x"; CLANG_CXX_LIBRARY = "libc++"; CLANG_ENABLE_MODULES = YES; CLANG_ENABLE_OBJC_ARC = YES; @@ -181,15 +183,17 @@ CLANG_WARN_DIRECT_OBJC_ISA_USAGE = YES_ERROR; CLANG_WARN_EMPTY_BODY = YES; CLANG_WARN_ENUM_CONVERSION = YES; + CLANG_WARN_INFINITE_RECURSION = YES; CLANG_WARN_INT_CONVERSION = YES; CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR; + CLANG_WARN_SUSPICIOUS_MOVE = YES; CLANG_WARN_UNREACHABLE_CODE = YES; CLANG_WARN__DUPLICATE_METHOD_MATCH = YES; COPY_PHASE_STRIP = NO; DEBUG_INFORMATION_FORMAT = "dwarf-with-dsym"; ENABLE_NS_ASSERTIONS = NO; ENABLE_STRICT_OBJC_MSGSEND = YES; - GCC_C_LANGUAGE_STANDARD = gnu99; + GCC_C_LANGUAGE_STANDARD = c11; GCC_NO_COMMON_BLOCKS = YES; GCC_WARN_64_TO_32_BIT_CONVERSION = YES; GCC_WARN_ABOUT_RETURN_TYPE = YES_ERROR; @@ -212,8 +216,9 @@ _FILE_FORMAT_DISTANCE_MATRIX, _FILE_FORMAT_LOWER_DISTANCE_MATRIX, _FILE_FORMAT_POINT_CLOUD, - USE_COEFFICIENTS, + _USE_COEFFICIENTS, ASSEMBLE_REDUCTION_MATRIX, + INDICATE_PROGRESS, ); PRODUCT_NAME = "$(TARGET_NAME)"; }; |