Merge pull request #77 from DerThorsten/dev

cleanup:
DerThorsten · Jun 1, 2017 · bf93881 · bf93881
2 parents 14b1c67 + a29e908
commit bf93881
Show file tree

Hide file tree

Showing 26 changed files with 7,211 additions and 3,330 deletions.
diff --git a/.gitmodules b/.gitmodules
@@ -1,7 +1,3 @@
-[submodule "externals/marray"]
-	path = externals/marray
-	url = https://github.com/DerThorsten/marray
-
 [submodule "externals/pybind11"]
 	path = externals/pybind11
 	url = https://github.com/pybind/pybind11

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -4,7 +4,7 @@ set(CMAKE_MODULE_PATH ${CMAKE_CURRENT_SOURCE_DIR}/cmake/modules)
 project(nifty)
 
 set (NIFTY_VERSION_MAJOR 0)
-set (NIFTY_VERSION_MINOR 14)
+set (NIFTY_VERSION_MINOR 15)
 set (NIFTY_VERSION_PATCH 0)
 
 
@@ -124,7 +124,7 @@ endif()
 #-------------------------------------------------------------------------------------------------------------------
 
 include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/externals/qpbo")
-include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/externals/marray/include")
+#include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/externals/marray/include")
 include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/externals/pybind11/include")
 include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/externals/vigra/include")
 include_directories( "${CMAKE_CURRENT_SOURCE_DIR}/externals/graph/include")

diff --git a/deprecated/cremi/malas.py b/deprecated/cremi/malas.py
diff --git a/deprecated/cremi/train.py b/deprecated/cremi/train.py
diff --git a/deprecated/learnit.py b/deprecated/learnit.py