Merge branch 'master' into miniapp
Fixed small conflict and fixed compiler warnings about signed-unsigned comparison when compiling in debug mode. Conflicts: src/fvm_cell.hpp
No related branches found
No related tags found
Showing
- CMakeLists.txt 8 additions, 2 deletionsCMakeLists.txt
- data/ball_and_stick.swc 2 additions, 3 deletionsdata/ball_and_stick.swc
- src/CMakeLists.txt 1 addition, 0 deletionssrc/CMakeLists.txt
- src/algorithms.hpp 2 additions, 1 deletionsrc/algorithms.hpp
- src/cell.cpp 2 additions, 1 deletionsrc/cell.cpp
- src/cell.hpp 1 addition, 0 deletionssrc/cell.hpp
- src/fvm_cell.hpp 11 additions, 1 deletionsrc/fvm_cell.hpp
- src/matrix.hpp 1 addition, 0 deletionssrc/matrix.hpp
- src/profiling/profiler.cpp 3 additions, 1 deletionsrc/profiling/profiler.cpp
- src/swcio.cpp 53 additions, 18 deletionssrc/swcio.cpp
- src/swcio.hpp 46 additions, 52 deletionssrc/swcio.hpp
- src/util.hpp 0 additions, 6 deletionssrc/util.hpp
- src/util/debug.cpp 16 additions, 0 deletionssrc/util/debug.cpp
- src/util/debug.hpp 30 additions, 0 deletionssrc/util/debug.hpp
- tests/CMakeLists.txt 1 addition, 0 deletionstests/CMakeLists.txt
- tests/test_algorithms.cpp 3 additions, 1 deletiontests/test_algorithms.cpp
- tests/test_probe.cpp 78 additions, 0 deletionstests/test_probe.cpp
- tests/test_swcio.cpp 66 additions, 14 deletionstests/test_swcio.cpp
Please register or sign in to comment