diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index fd616f2..c6bcf83 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -12,15 +12,36 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
-
-
@@ -40,23 +61,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -72,23 +81,54 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
@@ -99,11 +139,11 @@
-
+
-
-
+
+
@@ -131,6 +171,18 @@
+
+
+
+
+
+
+
+
+
+
+
+
@@ -173,6 +225,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -251,17 +321,18 @@
-
-
-
-
-
+
+
+
+
+
+
@@ -457,12 +528,12 @@
-
+
-
+
@@ -532,7 +603,7 @@
-
+
@@ -558,14 +629,11 @@
-
+
-
-
-
-
+
@@ -640,6 +708,7 @@
+
@@ -648,22 +717,22 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -673,34 +742,26 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
@@ -750,6 +811,60 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -758,34 +873,73 @@
-
+
-
-
+
+
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index dbb1c59..c38d574 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -3,5 +3,5 @@ project(ftests)
set(CMAKE_CXX_STANDARD 11)
-set(SOURCE_FILES examplar.cpp src/loaders.cpp src/loaders.h src/json/jsoncpp.cpp)
+set(SOURCE_FILES examplar.cpp src/loaders/loaders.cpp src/loaders/loaders.h src/json/jsoncpp.cpp src/loaders/JLoader.cpp src/loaders/JLoader.h src/loaders/helpers.cpp src/loaders/helpers.h src/loaders/Units.cpp src/loaders/Units.h src/loaders/Plan.cpp src/loaders/Plan.h src/loaders/Conf.cpp src/loaders/Conf.h)
add_executable(ftests ${SOURCE_FILES})
\ No newline at end of file
diff --git a/cmake-build-debug/CMakeFiles/Makefile2 b/cmake-build-debug/CMakeFiles/Makefile2
index f475d6b..376a1d7 100644
--- a/cmake-build-debug/CMakeFiles/Makefile2
+++ b/cmake-build-debug/CMakeFiles/Makefile2
@@ -66,7 +66,7 @@ CMAKE_BINARY_DIR = /home/phanes/Development/internal/ftests/cmake-build-debug
CMakeFiles/ftests.dir/all:
$(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/depend
$(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/build
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=1,2,3,4 "Built target ftests"
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=1,2,3,4,5,6,7,8,9 "Built target ftests"
.PHONY : CMakeFiles/ftests.dir/all
# Include target in all.
@@ -76,7 +76,7 @@ all: CMakeFiles/ftests.dir/all
# Build rule for subdir invocation for target.
CMakeFiles/ftests.dir/rule: cmake_check_build_system
- $(CMAKE_COMMAND) -E cmake_progress_start /home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles 4
+ $(CMAKE_COMMAND) -E cmake_progress_start /home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles 9
$(MAKE) -f CMakeFiles/Makefile2 CMakeFiles/ftests.dir/all
$(CMAKE_COMMAND) -E cmake_progress_start /home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles 0
.PHONY : CMakeFiles/ftests.dir/rule
diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/CXX.includecache b/cmake-build-debug/CMakeFiles/ftests.dir/CXX.includecache
index 7b05c5b..65fda6a 100644
--- a/cmake-build-debug/CMakeFiles/ftests.dir/CXX.includecache
+++ b/cmake-build-debug/CMakeFiles/ftests.dir/CXX.includecache
@@ -11,24 +11,8 @@ iostream
-
src/json/json.h
/home/phanes/Development/internal/ftests/src/json/json.h
-src/loaders.h
-/home/phanes/Development/internal/ftests/src/loaders.h
-
-/home/phanes/Development/internal/ftests/src/json/json-forwards.h
-stddef.h
--
-string
--
-stdint.h
--
-cpptl/config.h
--
-version.h
-/home/phanes/Development/internal/ftests/src/json/version.h
-allocator.h
-/home/phanes/Development/internal/ftests/src/json/allocator.h
-config.h
-/home/phanes/Development/internal/ftests/src/json/config.h
+src/loaders/loaders.h
+/home/phanes/Development/internal/ftests/src/loaders/loaders.h
/home/phanes/Development/internal/ftests/src/json/json.h
stddef.h
@@ -178,19 +162,27 @@ cmath
float.h
-
-/home/phanes/Development/internal/ftests/src/loaders.cpp
-loaders.h
-/home/phanes/Development/internal/ftests/src/loaders.h
-sys/stat.h
+/home/phanes/Development/internal/ftests/src/loaders/Conf.cpp
+Conf.h
+/home/phanes/Development/internal/ftests/src/loaders/Conf.h
+JLoader.h
+/home/phanes/Development/internal/ftests/src/loaders/JLoader.h
+string
-
-/home/phanes/Development/internal/ftests/src/loaders.h
-loaders.h
-/home/phanes/Development/internal/ftests/src/loaders.h
-json/json.h
+/home/phanes/Development/internal/ftests/src/loaders/Conf.h
+JLoader.h
+/home/phanes/Development/internal/ftests/src/loaders/JLoader.h
+
+/home/phanes/Development/internal/ftests/src/loaders/JLoader.cpp
+JLoader.h
+/home/phanes/Development/internal/ftests/src/loaders/JLoader.h
+helpers.h
+/home/phanes/Development/internal/ftests/src/loaders/helpers.h
+
+/home/phanes/Development/internal/ftests/src/loaders/JLoader.h
+../json/json.h
/home/phanes/Development/internal/ftests/src/json/json.h
-json/json-forwards.h
-/home/phanes/Development/internal/ftests/src/json/json-forwards.h
iostream
-
fstream
@@ -198,3 +190,51 @@ fstream
cstdlib
-
+/home/phanes/Development/internal/ftests/src/loaders/Plan.cpp
+Plan.h
+/home/phanes/Development/internal/ftests/src/loaders/Plan.h
+
+/home/phanes/Development/internal/ftests/src/loaders/Plan.h
+string
+-
+../json/json.h
+/home/phanes/Development/internal/ftests/src/json/json.h
+JLoader.h
+/home/phanes/Development/internal/ftests/src/loaders/JLoader.h
+
+/home/phanes/Development/internal/ftests/src/loaders/Units.cpp
+Units.h
+/home/phanes/Development/internal/ftests/src/loaders/Units.h
+
+/home/phanes/Development/internal/ftests/src/loaders/Units.h
+vector
+-
+../json/json.h
+/home/phanes/Development/internal/ftests/src/json/json.h
+JLoader.h
+/home/phanes/Development/internal/ftests/src/loaders/JLoader.h
+
+/home/phanes/Development/internal/ftests/src/loaders/helpers.cpp
+helpers.h
+/home/phanes/Development/internal/ftests/src/loaders/helpers.h
+
+/home/phanes/Development/internal/ftests/src/loaders/helpers.h
+string
+-
+sys/stat.h
+-
+
+/home/phanes/Development/internal/ftests/src/loaders/loaders.cpp
+loaders.h
+/home/phanes/Development/internal/ftests/src/loaders/loaders.h
+
+/home/phanes/Development/internal/ftests/src/loaders/loaders.h
+JLoader.h
+/home/phanes/Development/internal/ftests/src/loaders/JLoader.h
+Units.h
+/home/phanes/Development/internal/ftests/src/loaders/Units.h
+Plan.h
+/home/phanes/Development/internal/ftests/src/loaders/Plan.h
+Conf.h
+/home/phanes/Development/internal/ftests/src/loaders/Conf.h
+
diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/DependInfo.cmake b/cmake-build-debug/CMakeFiles/ftests.dir/DependInfo.cmake
index 93b6361..dc1c365 100644
--- a/cmake-build-debug/CMakeFiles/ftests.dir/DependInfo.cmake
+++ b/cmake-build-debug/CMakeFiles/ftests.dir/DependInfo.cmake
@@ -6,7 +6,12 @@ set(CMAKE_DEPENDS_LANGUAGES
set(CMAKE_DEPENDS_CHECK_CXX
"/home/phanes/Development/internal/ftests/examplar.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o"
"/home/phanes/Development/internal/ftests/src/json/jsoncpp.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o"
- "/home/phanes/Development/internal/ftests/src/loaders.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders.cpp.o"
+ "/home/phanes/Development/internal/ftests/src/loaders/Conf.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o"
+ "/home/phanes/Development/internal/ftests/src/loaders/JLoader.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o"
+ "/home/phanes/Development/internal/ftests/src/loaders/Plan.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o"
+ "/home/phanes/Development/internal/ftests/src/loaders/Units.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Units.cpp.o"
+ "/home/phanes/Development/internal/ftests/src/loaders/helpers.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o"
+ "/home/phanes/Development/internal/ftests/src/loaders/loaders.cpp" "/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o"
)
set(CMAKE_CXX_COMPILER_ID "GNU")
diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/build.make b/cmake-build-debug/CMakeFiles/ftests.dir/build.make
index c7b9e95..8472b9c 100644
--- a/cmake-build-debug/CMakeFiles/ftests.dir/build.make
+++ b/cmake-build-debug/CMakeFiles/ftests.dir/build.make
@@ -81,28 +81,28 @@ CMakeFiles/ftests.dir/examplar.cpp.o.provides: CMakeFiles/ftests.dir/examplar.cp
CMakeFiles/ftests.dir/examplar.cpp.o.provides.build: CMakeFiles/ftests.dir/examplar.cpp.o
-CMakeFiles/ftests.dir/src/loaders.cpp.o: CMakeFiles/ftests.dir/flags.make
-CMakeFiles/ftests.dir/src/loaders.cpp.o: ../src/loaders.cpp
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building CXX object CMakeFiles/ftests.dir/src/loaders.cpp.o"
- /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/ftests.dir/src/loaders.cpp.o -c /home/phanes/Development/internal/ftests/src/loaders.cpp
+CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: CMakeFiles/ftests.dir/flags.make
+CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/loaders.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_2) "Building CXX object CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o"
+ /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o -c /home/phanes/Development/internal/ftests/src/loaders/loaders.cpp
-CMakeFiles/ftests.dir/src/loaders.cpp.i: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/ftests.dir/src/loaders.cpp.i"
- /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/phanes/Development/internal/ftests/src/loaders.cpp > CMakeFiles/ftests.dir/src/loaders.cpp.i
+CMakeFiles/ftests.dir/src/loaders/loaders.cpp.i: cmake_force
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/ftests.dir/src/loaders/loaders.cpp.i"
+ /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/phanes/Development/internal/ftests/src/loaders/loaders.cpp > CMakeFiles/ftests.dir/src/loaders/loaders.cpp.i
-CMakeFiles/ftests.dir/src/loaders.cpp.s: cmake_force
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/ftests.dir/src/loaders.cpp.s"
- /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/phanes/Development/internal/ftests/src/loaders.cpp -o CMakeFiles/ftests.dir/src/loaders.cpp.s
+CMakeFiles/ftests.dir/src/loaders/loaders.cpp.s: cmake_force
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/ftests.dir/src/loaders/loaders.cpp.s"
+ /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/phanes/Development/internal/ftests/src/loaders/loaders.cpp -o CMakeFiles/ftests.dir/src/loaders/loaders.cpp.s
-CMakeFiles/ftests.dir/src/loaders.cpp.o.requires:
+CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o.requires:
-.PHONY : CMakeFiles/ftests.dir/src/loaders.cpp.o.requires
+.PHONY : CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o.requires
-CMakeFiles/ftests.dir/src/loaders.cpp.o.provides: CMakeFiles/ftests.dir/src/loaders.cpp.o.requires
- $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders.cpp.o.provides.build
-.PHONY : CMakeFiles/ftests.dir/src/loaders.cpp.o.provides
+CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o.provides: CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o.requires
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o.provides.build
+.PHONY : CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o.provides
-CMakeFiles/ftests.dir/src/loaders.cpp.o.provides.build: CMakeFiles/ftests.dir/src/loaders.cpp.o
+CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o.provides.build: CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o
CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o: CMakeFiles/ftests.dir/flags.make
@@ -129,21 +129,151 @@ CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.provides: CMakeFiles/ftests.dir/src
CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.provides.build: CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o
+CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o: CMakeFiles/ftests.dir/flags.make
+CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o: ../src/loaders/JLoader.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Building CXX object CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o"
+ /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o -c /home/phanes/Development/internal/ftests/src/loaders/JLoader.cpp
+
+CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.i: cmake_force
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.i"
+ /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/phanes/Development/internal/ftests/src/loaders/JLoader.cpp > CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.i
+
+CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.s: cmake_force
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.s"
+ /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/phanes/Development/internal/ftests/src/loaders/JLoader.cpp -o CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.s
+
+CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.requires:
+
+.PHONY : CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.requires
+
+CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.provides: CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.requires
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.provides.build
+.PHONY : CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.provides
+
+CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.provides.build: CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o
+
+
+CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o: CMakeFiles/ftests.dir/flags.make
+CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o: ../src/loaders/helpers.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_5) "Building CXX object CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o"
+ /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o -c /home/phanes/Development/internal/ftests/src/loaders/helpers.cpp
+
+CMakeFiles/ftests.dir/src/loaders/helpers.cpp.i: cmake_force
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/ftests.dir/src/loaders/helpers.cpp.i"
+ /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/phanes/Development/internal/ftests/src/loaders/helpers.cpp > CMakeFiles/ftests.dir/src/loaders/helpers.cpp.i
+
+CMakeFiles/ftests.dir/src/loaders/helpers.cpp.s: cmake_force
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/ftests.dir/src/loaders/helpers.cpp.s"
+ /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/phanes/Development/internal/ftests/src/loaders/helpers.cpp -o CMakeFiles/ftests.dir/src/loaders/helpers.cpp.s
+
+CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o.requires:
+
+.PHONY : CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o.requires
+
+CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o.provides: CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o.requires
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o.provides.build
+.PHONY : CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o.provides
+
+CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o.provides.build: CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o
+
+
+CMakeFiles/ftests.dir/src/loaders/Units.cpp.o: CMakeFiles/ftests.dir/flags.make
+CMakeFiles/ftests.dir/src/loaders/Units.cpp.o: ../src/loaders/Units.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_6) "Building CXX object CMakeFiles/ftests.dir/src/loaders/Units.cpp.o"
+ /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/ftests.dir/src/loaders/Units.cpp.o -c /home/phanes/Development/internal/ftests/src/loaders/Units.cpp
+
+CMakeFiles/ftests.dir/src/loaders/Units.cpp.i: cmake_force
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/ftests.dir/src/loaders/Units.cpp.i"
+ /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/phanes/Development/internal/ftests/src/loaders/Units.cpp > CMakeFiles/ftests.dir/src/loaders/Units.cpp.i
+
+CMakeFiles/ftests.dir/src/loaders/Units.cpp.s: cmake_force
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/ftests.dir/src/loaders/Units.cpp.s"
+ /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/phanes/Development/internal/ftests/src/loaders/Units.cpp -o CMakeFiles/ftests.dir/src/loaders/Units.cpp.s
+
+CMakeFiles/ftests.dir/src/loaders/Units.cpp.o.requires:
+
+.PHONY : CMakeFiles/ftests.dir/src/loaders/Units.cpp.o.requires
+
+CMakeFiles/ftests.dir/src/loaders/Units.cpp.o.provides: CMakeFiles/ftests.dir/src/loaders/Units.cpp.o.requires
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/Units.cpp.o.provides.build
+.PHONY : CMakeFiles/ftests.dir/src/loaders/Units.cpp.o.provides
+
+CMakeFiles/ftests.dir/src/loaders/Units.cpp.o.provides.build: CMakeFiles/ftests.dir/src/loaders/Units.cpp.o
+
+
+CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: CMakeFiles/ftests.dir/flags.make
+CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/loaders/Plan.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_7) "Building CXX object CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o"
+ /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o -c /home/phanes/Development/internal/ftests/src/loaders/Plan.cpp
+
+CMakeFiles/ftests.dir/src/loaders/Plan.cpp.i: cmake_force
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/ftests.dir/src/loaders/Plan.cpp.i"
+ /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/phanes/Development/internal/ftests/src/loaders/Plan.cpp > CMakeFiles/ftests.dir/src/loaders/Plan.cpp.i
+
+CMakeFiles/ftests.dir/src/loaders/Plan.cpp.s: cmake_force
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/ftests.dir/src/loaders/Plan.cpp.s"
+ /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/phanes/Development/internal/ftests/src/loaders/Plan.cpp -o CMakeFiles/ftests.dir/src/loaders/Plan.cpp.s
+
+CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o.requires:
+
+.PHONY : CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o.requires
+
+CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o.provides: CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o.requires
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o.provides.build
+.PHONY : CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o.provides
+
+CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o.provides.build: CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o
+
+
+CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o: CMakeFiles/ftests.dir/flags.make
+CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o: ../src/loaders/Conf.cpp
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_8) "Building CXX object CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o"
+ /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -o CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o -c /home/phanes/Development/internal/ftests/src/loaders/Conf.cpp
+
+CMakeFiles/ftests.dir/src/loaders/Conf.cpp.i: cmake_force
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Preprocessing CXX source to CMakeFiles/ftests.dir/src/loaders/Conf.cpp.i"
+ /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -E /home/phanes/Development/internal/ftests/src/loaders/Conf.cpp > CMakeFiles/ftests.dir/src/loaders/Conf.cpp.i
+
+CMakeFiles/ftests.dir/src/loaders/Conf.cpp.s: cmake_force
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green "Compiling CXX source to assembly CMakeFiles/ftests.dir/src/loaders/Conf.cpp.s"
+ /usr/bin/c++ $(CXX_DEFINES) $(CXX_INCLUDES) $(CXX_FLAGS) -S /home/phanes/Development/internal/ftests/src/loaders/Conf.cpp -o CMakeFiles/ftests.dir/src/loaders/Conf.cpp.s
+
+CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o.requires:
+
+.PHONY : CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o.requires
+
+CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o.provides: CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o.requires
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o.provides.build
+.PHONY : CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o.provides
+
+CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o.provides.build: CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o
+
+
# Object files for target ftests
ftests_OBJECTS = \
"CMakeFiles/ftests.dir/examplar.cpp.o" \
-"CMakeFiles/ftests.dir/src/loaders.cpp.o" \
-"CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o"
+"CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o" \
+"CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o" \
+"CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o" \
+"CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o" \
+"CMakeFiles/ftests.dir/src/loaders/Units.cpp.o" \
+"CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o" \
+"CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o"
# External object files for target ftests
ftests_EXTERNAL_OBJECTS =
ftests: CMakeFiles/ftests.dir/examplar.cpp.o
-ftests: CMakeFiles/ftests.dir/src/loaders.cpp.o
+ftests: CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o
ftests: CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o
+ftests: CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o
+ftests: CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o
+ftests: CMakeFiles/ftests.dir/src/loaders/Units.cpp.o
+ftests: CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o
+ftests: CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o
ftests: CMakeFiles/ftests.dir/build.make
ftests: CMakeFiles/ftests.dir/link.txt
- @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_4) "Linking CXX executable ftests"
+ @$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --green --bold --progress-dir=/home/phanes/Development/internal/ftests/cmake-build-debug/CMakeFiles --progress-num=$(CMAKE_PROGRESS_9) "Linking CXX executable ftests"
$(CMAKE_COMMAND) -E cmake_link_script CMakeFiles/ftests.dir/link.txt --verbose=$(VERBOSE)
# Rule to build all files generated by this target.
@@ -152,8 +282,13 @@ CMakeFiles/ftests.dir/build: ftests
.PHONY : CMakeFiles/ftests.dir/build
CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/examplar.cpp.o.requires
-CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders.cpp.o.requires
+CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o.requires
CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o.requires
+CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o.requires
+CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o.requires
+CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/Units.cpp.o.requires
+CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o.requires
+CMakeFiles/ftests.dir/requires: CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o.requires
.PHONY : CMakeFiles/ftests.dir/requires
diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/cmake_clean.cmake b/cmake-build-debug/CMakeFiles/ftests.dir/cmake_clean.cmake
index b75014d..4ad02f1 100644
--- a/cmake-build-debug/CMakeFiles/ftests.dir/cmake_clean.cmake
+++ b/cmake-build-debug/CMakeFiles/ftests.dir/cmake_clean.cmake
@@ -1,7 +1,12 @@
file(REMOVE_RECURSE
"CMakeFiles/ftests.dir/examplar.cpp.o"
- "CMakeFiles/ftests.dir/src/loaders.cpp.o"
+ "CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o"
"CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o"
+ "CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o"
+ "CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o"
+ "CMakeFiles/ftests.dir/src/loaders/Units.cpp.o"
+ "CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o"
+ "CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o"
"ftests.pdb"
"ftests"
)
diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/depend.internal b/cmake-build-debug/CMakeFiles/ftests.dir/depend.internal
index 50b3242..d7e43fc 100644
--- a/cmake-build-debug/CMakeFiles/ftests.dir/depend.internal
+++ b/cmake-build-debug/CMakeFiles/ftests.dir/depend.internal
@@ -3,14 +3,43 @@
CMakeFiles/ftests.dir/examplar.cpp.o
/home/phanes/Development/internal/ftests/examplar.cpp
- /home/phanes/Development/internal/ftests/src/json/json-forwards.h
/home/phanes/Development/internal/ftests/src/json/json.h
- /home/phanes/Development/internal/ftests/src/loaders.h
+ /home/phanes/Development/internal/ftests/src/loaders/Conf.h
+ /home/phanes/Development/internal/ftests/src/loaders/JLoader.h
+ /home/phanes/Development/internal/ftests/src/loaders/Plan.h
+ /home/phanes/Development/internal/ftests/src/loaders/Units.h
+ /home/phanes/Development/internal/ftests/src/loaders/loaders.h
CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o
/home/phanes/Development/internal/ftests/src/json/json.h
/home/phanes/Development/internal/ftests/src/json/jsoncpp.cpp
-CMakeFiles/ftests.dir/src/loaders.cpp.o
- /home/phanes/Development/internal/ftests/src/json/json-forwards.h
+CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o
/home/phanes/Development/internal/ftests/src/json/json.h
- /home/phanes/Development/internal/ftests/src/loaders.cpp
- /home/phanes/Development/internal/ftests/src/loaders.h
+ /home/phanes/Development/internal/ftests/src/loaders/Conf.cpp
+ /home/phanes/Development/internal/ftests/src/loaders/Conf.h
+ /home/phanes/Development/internal/ftests/src/loaders/JLoader.h
+CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o
+ /home/phanes/Development/internal/ftests/src/json/json.h
+ /home/phanes/Development/internal/ftests/src/loaders/JLoader.cpp
+ /home/phanes/Development/internal/ftests/src/loaders/JLoader.h
+ /home/phanes/Development/internal/ftests/src/loaders/helpers.h
+CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o
+ /home/phanes/Development/internal/ftests/src/json/json.h
+ /home/phanes/Development/internal/ftests/src/loaders/JLoader.h
+ /home/phanes/Development/internal/ftests/src/loaders/Plan.cpp
+ /home/phanes/Development/internal/ftests/src/loaders/Plan.h
+CMakeFiles/ftests.dir/src/loaders/Units.cpp.o
+ /home/phanes/Development/internal/ftests/src/json/json.h
+ /home/phanes/Development/internal/ftests/src/loaders/JLoader.h
+ /home/phanes/Development/internal/ftests/src/loaders/Units.cpp
+ /home/phanes/Development/internal/ftests/src/loaders/Units.h
+CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o
+ /home/phanes/Development/internal/ftests/src/loaders/helpers.cpp
+ /home/phanes/Development/internal/ftests/src/loaders/helpers.h
+CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o
+ /home/phanes/Development/internal/ftests/src/json/json.h
+ /home/phanes/Development/internal/ftests/src/loaders/Conf.h
+ /home/phanes/Development/internal/ftests/src/loaders/JLoader.h
+ /home/phanes/Development/internal/ftests/src/loaders/Plan.h
+ /home/phanes/Development/internal/ftests/src/loaders/Units.h
+ /home/phanes/Development/internal/ftests/src/loaders/loaders.cpp
+ /home/phanes/Development/internal/ftests/src/loaders/loaders.h
diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/depend.make b/cmake-build-debug/CMakeFiles/ftests.dir/depend.make
index a45bd86..cbb475d 100644
--- a/cmake-build-debug/CMakeFiles/ftests.dir/depend.make
+++ b/cmake-build-debug/CMakeFiles/ftests.dir/depend.make
@@ -2,15 +2,44 @@
# Generated by "Unix Makefiles" Generator, CMake Version 3.5
CMakeFiles/ftests.dir/examplar.cpp.o: ../examplar.cpp
-CMakeFiles/ftests.dir/examplar.cpp.o: ../src/json/json-forwards.h
CMakeFiles/ftests.dir/examplar.cpp.o: ../src/json/json.h
-CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders.h
+CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/Conf.h
+CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/JLoader.h
+CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/Plan.h
+CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/Units.h
+CMakeFiles/ftests.dir/examplar.cpp.o: ../src/loaders/loaders.h
CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o: ../src/json/json.h
CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o: ../src/json/jsoncpp.cpp
-CMakeFiles/ftests.dir/src/loaders.cpp.o: ../src/json/json-forwards.h
-CMakeFiles/ftests.dir/src/loaders.cpp.o: ../src/json/json.h
-CMakeFiles/ftests.dir/src/loaders.cpp.o: ../src/loaders.cpp
-CMakeFiles/ftests.dir/src/loaders.cpp.o: ../src/loaders.h
+CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o: ../src/json/json.h
+CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o: ../src/loaders/Conf.cpp
+CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o: ../src/loaders/Conf.h
+CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o: ../src/loaders/JLoader.h
+
+CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o: ../src/json/json.h
+CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o: ../src/loaders/JLoader.cpp
+CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o: ../src/loaders/JLoader.h
+CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o: ../src/loaders/helpers.h
+
+CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/json/json.h
+CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/loaders/JLoader.h
+CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/loaders/Plan.cpp
+CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o: ../src/loaders/Plan.h
+
+CMakeFiles/ftests.dir/src/loaders/Units.cpp.o: ../src/json/json.h
+CMakeFiles/ftests.dir/src/loaders/Units.cpp.o: ../src/loaders/JLoader.h
+CMakeFiles/ftests.dir/src/loaders/Units.cpp.o: ../src/loaders/Units.cpp
+CMakeFiles/ftests.dir/src/loaders/Units.cpp.o: ../src/loaders/Units.h
+
+CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o: ../src/loaders/helpers.cpp
+CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o: ../src/loaders/helpers.h
+
+CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/json/json.h
+CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/Conf.h
+CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/JLoader.h
+CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/Plan.h
+CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/Units.h
+CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/loaders.cpp
+CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o: ../src/loaders/loaders.h
diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o b/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o
index 60538db..bb10f29 100644
Binary files a/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o and b/cmake-build-debug/CMakeFiles/ftests.dir/examplar.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/link.txt b/cmake-build-debug/CMakeFiles/ftests.dir/link.txt
index 0e55314..860463a 100644
--- a/cmake-build-debug/CMakeFiles/ftests.dir/link.txt
+++ b/cmake-build-debug/CMakeFiles/ftests.dir/link.txt
@@ -1 +1 @@
-/usr/bin/c++ -g CMakeFiles/ftests.dir/examplar.cpp.o CMakeFiles/ftests.dir/src/loaders.cpp.o CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o -o ftests
+/usr/bin/c++ -g CMakeFiles/ftests.dir/examplar.cpp.o CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.o CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o CMakeFiles/ftests.dir/src/loaders/Units.cpp.o CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o -o ftests
diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/progress.make b/cmake-build-debug/CMakeFiles/ftests.dir/progress.make
index a69a57e..d4f6ce3 100644
--- a/cmake-build-debug/CMakeFiles/ftests.dir/progress.make
+++ b/cmake-build-debug/CMakeFiles/ftests.dir/progress.make
@@ -2,4 +2,9 @@ CMAKE_PROGRESS_1 = 1
CMAKE_PROGRESS_2 = 2
CMAKE_PROGRESS_3 = 3
CMAKE_PROGRESS_4 = 4
+CMAKE_PROGRESS_5 = 5
+CMAKE_PROGRESS_6 = 6
+CMAKE_PROGRESS_7 = 7
+CMAKE_PROGRESS_8 = 8
+CMAKE_PROGRESS_9 = 9
diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders.cpp.o b/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders.cpp.o
deleted file mode 100644
index e28e8ed..0000000
Binary files a/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders.cpp.o and /dev/null differ
diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o b/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o
new file mode 100644
index 0000000..35750a7
Binary files /dev/null and b/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o b/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o
new file mode 100644
index 0000000..3ee2aeb
Binary files /dev/null and b/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o b/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o
new file mode 100644
index 0000000..b4e6862
Binary files /dev/null and b/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Units.cpp.o b/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Units.cpp.o
new file mode 100644
index 0000000..dbb5fb2
Binary files /dev/null and b/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/Units.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o b/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o
new file mode 100644
index 0000000..f519b5a
Binary files /dev/null and b/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o b/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o
new file mode 100644
index 0000000..9139f39
Binary files /dev/null and b/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/progress.marks b/cmake-build-debug/CMakeFiles/progress.marks
index b8626c4..ec63514 100644
--- a/cmake-build-debug/CMakeFiles/progress.marks
+++ b/cmake-build-debug/CMakeFiles/progress.marks
@@ -1 +1 @@
-4
+9
diff --git a/cmake-build-debug/Makefile b/cmake-build-debug/Makefile
index 925e1a9..be8554c 100644
--- a/cmake-build-debug/Makefile
+++ b/cmake-build-debug/Makefile
@@ -177,32 +177,167 @@ src/json/jsoncpp.cpp.s:
$(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/json/jsoncpp.cpp.s
.PHONY : src/json/jsoncpp.cpp.s
-src/loaders.o: src/loaders.cpp.o
+src/loaders/Conf.o: src/loaders/Conf.cpp.o
-.PHONY : src/loaders.o
+.PHONY : src/loaders/Conf.o
# target to build an object file
-src/loaders.cpp.o:
- $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders.cpp.o
-.PHONY : src/loaders.cpp.o
+src/loaders/Conf.cpp.o:
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/Conf.cpp.o
+.PHONY : src/loaders/Conf.cpp.o
-src/loaders.i: src/loaders.cpp.i
+src/loaders/Conf.i: src/loaders/Conf.cpp.i
-.PHONY : src/loaders.i
+.PHONY : src/loaders/Conf.i
# target to preprocess a source file
-src/loaders.cpp.i:
- $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders.cpp.i
-.PHONY : src/loaders.cpp.i
+src/loaders/Conf.cpp.i:
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/Conf.cpp.i
+.PHONY : src/loaders/Conf.cpp.i
-src/loaders.s: src/loaders.cpp.s
+src/loaders/Conf.s: src/loaders/Conf.cpp.s
-.PHONY : src/loaders.s
+.PHONY : src/loaders/Conf.s
# target to generate assembly for a file
-src/loaders.cpp.s:
- $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders.cpp.s
-.PHONY : src/loaders.cpp.s
+src/loaders/Conf.cpp.s:
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/Conf.cpp.s
+.PHONY : src/loaders/Conf.cpp.s
+
+src/loaders/JLoader.o: src/loaders/JLoader.cpp.o
+
+.PHONY : src/loaders/JLoader.o
+
+# target to build an object file
+src/loaders/JLoader.cpp.o:
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.o
+.PHONY : src/loaders/JLoader.cpp.o
+
+src/loaders/JLoader.i: src/loaders/JLoader.cpp.i
+
+.PHONY : src/loaders/JLoader.i
+
+# target to preprocess a source file
+src/loaders/JLoader.cpp.i:
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.i
+.PHONY : src/loaders/JLoader.cpp.i
+
+src/loaders/JLoader.s: src/loaders/JLoader.cpp.s
+
+.PHONY : src/loaders/JLoader.s
+
+# target to generate assembly for a file
+src/loaders/JLoader.cpp.s:
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/JLoader.cpp.s
+.PHONY : src/loaders/JLoader.cpp.s
+
+src/loaders/Plan.o: src/loaders/Plan.cpp.o
+
+.PHONY : src/loaders/Plan.o
+
+# target to build an object file
+src/loaders/Plan.cpp.o:
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/Plan.cpp.o
+.PHONY : src/loaders/Plan.cpp.o
+
+src/loaders/Plan.i: src/loaders/Plan.cpp.i
+
+.PHONY : src/loaders/Plan.i
+
+# target to preprocess a source file
+src/loaders/Plan.cpp.i:
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/Plan.cpp.i
+.PHONY : src/loaders/Plan.cpp.i
+
+src/loaders/Plan.s: src/loaders/Plan.cpp.s
+
+.PHONY : src/loaders/Plan.s
+
+# target to generate assembly for a file
+src/loaders/Plan.cpp.s:
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/Plan.cpp.s
+.PHONY : src/loaders/Plan.cpp.s
+
+src/loaders/Units.o: src/loaders/Units.cpp.o
+
+.PHONY : src/loaders/Units.o
+
+# target to build an object file
+src/loaders/Units.cpp.o:
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/Units.cpp.o
+.PHONY : src/loaders/Units.cpp.o
+
+src/loaders/Units.i: src/loaders/Units.cpp.i
+
+.PHONY : src/loaders/Units.i
+
+# target to preprocess a source file
+src/loaders/Units.cpp.i:
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/Units.cpp.i
+.PHONY : src/loaders/Units.cpp.i
+
+src/loaders/Units.s: src/loaders/Units.cpp.s
+
+.PHONY : src/loaders/Units.s
+
+# target to generate assembly for a file
+src/loaders/Units.cpp.s:
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/Units.cpp.s
+.PHONY : src/loaders/Units.cpp.s
+
+src/loaders/helpers.o: src/loaders/helpers.cpp.o
+
+.PHONY : src/loaders/helpers.o
+
+# target to build an object file
+src/loaders/helpers.cpp.o:
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/helpers.cpp.o
+.PHONY : src/loaders/helpers.cpp.o
+
+src/loaders/helpers.i: src/loaders/helpers.cpp.i
+
+.PHONY : src/loaders/helpers.i
+
+# target to preprocess a source file
+src/loaders/helpers.cpp.i:
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/helpers.cpp.i
+.PHONY : src/loaders/helpers.cpp.i
+
+src/loaders/helpers.s: src/loaders/helpers.cpp.s
+
+.PHONY : src/loaders/helpers.s
+
+# target to generate assembly for a file
+src/loaders/helpers.cpp.s:
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/helpers.cpp.s
+.PHONY : src/loaders/helpers.cpp.s
+
+src/loaders/loaders.o: src/loaders/loaders.cpp.o
+
+.PHONY : src/loaders/loaders.o
+
+# target to build an object file
+src/loaders/loaders.cpp.o:
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/loaders.cpp.o
+.PHONY : src/loaders/loaders.cpp.o
+
+src/loaders/loaders.i: src/loaders/loaders.cpp.i
+
+.PHONY : src/loaders/loaders.i
+
+# target to preprocess a source file
+src/loaders/loaders.cpp.i:
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/loaders.cpp.i
+.PHONY : src/loaders/loaders.cpp.i
+
+src/loaders/loaders.s: src/loaders/loaders.cpp.s
+
+.PHONY : src/loaders/loaders.s
+
+# target to generate assembly for a file
+src/loaders/loaders.cpp.s:
+ $(MAKE) -f CMakeFiles/ftests.dir/build.make CMakeFiles/ftests.dir/src/loaders/loaders.cpp.s
+.PHONY : src/loaders/loaders.cpp.s
# Help Target
help:
@@ -219,9 +354,24 @@ help:
@echo "... src/json/jsoncpp.o"
@echo "... src/json/jsoncpp.i"
@echo "... src/json/jsoncpp.s"
- @echo "... src/loaders.o"
- @echo "... src/loaders.i"
- @echo "... src/loaders.s"
+ @echo "... src/loaders/Conf.o"
+ @echo "... src/loaders/Conf.i"
+ @echo "... src/loaders/Conf.s"
+ @echo "... src/loaders/JLoader.o"
+ @echo "... src/loaders/JLoader.i"
+ @echo "... src/loaders/JLoader.s"
+ @echo "... src/loaders/Plan.o"
+ @echo "... src/loaders/Plan.i"
+ @echo "... src/loaders/Plan.s"
+ @echo "... src/loaders/Units.o"
+ @echo "... src/loaders/Units.i"
+ @echo "... src/loaders/Units.s"
+ @echo "... src/loaders/helpers.o"
+ @echo "... src/loaders/helpers.i"
+ @echo "... src/loaders/helpers.s"
+ @echo "... src/loaders/loaders.o"
+ @echo "... src/loaders/loaders.i"
+ @echo "... src/loaders/loaders.s"
.PHONY : help
diff --git a/cmake-build-debug/ftests b/cmake-build-debug/ftests
index f9e78ac..485ceed 100755
Binary files a/cmake-build-debug/ftests and b/cmake-build-debug/ftests differ
diff --git a/cmake-build-debug/ftests.cbp b/cmake-build-debug/ftests.cbp
index c02dd48..83c4c59 100644
--- a/cmake-build-debug/ftests.cbp
+++ b/cmake-build-debug/ftests.cbp
@@ -90,10 +90,40 @@
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/examplar.cpp b/examplar.cpp
index 8fb18ab..9533bb2 100644
--- a/examplar.cpp
+++ b/examplar.cpp
@@ -1,6 +1,6 @@
#include
#include "src/json/json.h"
-#include "src/loaders.h"
+#include "src/loaders/loaders.h"
int main()
{
diff --git a/src/loaders.h b/src/loaders.h
deleted file mode 100644
index 3101a48..0000000
--- a/src/loaders.h
+++ /dev/null
@@ -1,90 +0,0 @@
-//
-// Created by phanes on 4/16/17.
-//
-
-#ifndef FTESTS_LOADERS_H
-#define FTESTS_LOADERS_H
-
-#include "loaders.h"
-#include "json/json.h"
-#include "json/json-forwards.h"
-#include
-#include
-#include
-
-inline bool exists (const std::string& name);
-
-class JLoader
-{
- private:
- Json::Value json_root;
- public:
- JLoader( std::string filename );
- Json::Value get_root();
-};
-
-class Unit
-{
- private:
- std::string name;
- std::string target;
- std::string output;
- std::string rectifier;
- std::string active;
- std::string required;
- std::string rectify;
-
- public:
- Unit( Json::Value loader_root );
- std::string get_name();
- std::string get_target();
- std::string get_output();
- std::string get_rectifier();
- std::string get_active();
- std::string get_required();
- std::string get_rectify();
-};
-
-class UnitHolder: public JLoader
-{
- public:
- using JLoader::JLoader;
- std::vector units;
- UnitHolder( std::string filename );
- Unit select_unit( std::string provided_name );
-};
-
-class Task
-{
- private:
- std::string name;
- Json::Value dependencies;
-
- public:
- Task( Json::Value loader_root );
- std::string get_name();
- Json::Value get_dependencies();
-};
-
-class Plan: public JLoader
-{
- public:
- using JLoader::JLoader;
- std::vector tasks;
- Plan( std::string filename );
-};
-
-class Conf: public JLoader
-{
- private:
- std::string plan_path;
- std::string units_path;
-
- public:
- using JLoader::JLoader;
- Conf( std::string filename );
- std::string get_plan_path();
- std::string get_units_path();
-};
-
-#endif //FTESTS_LOADERS_H
diff --git a/src/loaders/Conf.cpp b/src/loaders/Conf.cpp
new file mode 100644
index 0000000..c9f64ef
--- /dev/null
+++ b/src/loaders/Conf.cpp
@@ -0,0 +1,24 @@
+//
+// Created by phanes on 4/22/17.
+//
+
+#include "Conf.h"
+#include "JLoader.h"
+#include
+
+
+Conf::Conf( std::string filename ): JLoader( filename )
+{
+ this->plan_path = this->get_root()["plan_path"].asString();
+ this->units_path = this->get_root()["units_path"].asString();
+};
+
+std::string Conf::get_plan_path()
+{
+ return this->plan_path;
+}
+
+std::string Conf::get_units_path()
+{
+ return this->units_path;
+}
diff --git a/src/loaders/Conf.h b/src/loaders/Conf.h
new file mode 100644
index 0000000..029f5d8
--- /dev/null
+++ b/src/loaders/Conf.h
@@ -0,0 +1,22 @@
+//
+// Created by phanes on 4/22/17.
+//
+
+#ifndef FTESTS_CONF_H
+#define FTESTS_CONF_H
+#include "JLoader.h"
+
+class Conf: public JLoader
+{
+private:
+ std::string plan_path;
+ std::string units_path;
+
+public:
+ using JLoader::JLoader;
+ Conf( std::string filename );
+ std::string get_plan_path();
+ std::string get_units_path();
+};
+
+#endif //FTESTS_CONF_H
diff --git a/src/loaders/JLoader.cpp b/src/loaders/JLoader.cpp
new file mode 100644
index 0000000..0d29024
--- /dev/null
+++ b/src/loaders/JLoader.cpp
@@ -0,0 +1,34 @@
+//
+// Created by phanes on 4/22/17.
+//
+
+#include "JLoader.h"
+#include "helpers.h"
+
+JLoader::JLoader( std::string filename )
+{
+ Json::Value json_root;
+ Json::Reader reader;
+
+ if (! exists( filename ) )
+ {
+ std::cerr << "File '" << filename << "' does not exist.";
+ exit(1);
+ }
+
+ std::ifstream jfile( filename, std::ifstream::binary );
+
+ bool parsingSuccessful = reader.parse( jfile, this->json_root );
+ if (! parsingSuccessful )
+ {
+ std::cerr << "Failed to parse " << filename << ":\n\t" << reader.getFormattedErrorMessages();
+ std::exit( 1 );
+ } else {
+ std::cout << "Parsed " << filename << " with " << this->json_root.size() << " elements." << std::endl;
+ }
+}
+
+Json::Value JLoader::get_root()
+{
+ return this->json_root;
+}
\ No newline at end of file
diff --git a/src/loaders/JLoader.h b/src/loaders/JLoader.h
new file mode 100644
index 0000000..ff5890a
--- /dev/null
+++ b/src/loaders/JLoader.h
@@ -0,0 +1,21 @@
+//
+// Created by phanes on 4/22/17.
+//
+
+#ifndef FTESTS_JLOADER_H
+#define FTESTS_JLOADER_H
+#include "../json/json.h"
+#include
+#include
+#include
+
+
+class JLoader
+{
+private:
+ Json::Value json_root;
+public:
+ JLoader( std::string filename );
+ Json::Value get_root();
+};
+#endif //FTESTS_JLOADER_H
diff --git a/src/loaders/Plan.cpp b/src/loaders/Plan.cpp
new file mode 100644
index 0000000..c3f373e
--- /dev/null
+++ b/src/loaders/Plan.cpp
@@ -0,0 +1,25 @@
+//
+// Created by phanes on 4/22/17.
+//
+
+#include "Plan.h"
+Task::Task( Json::Value loader_root )
+{
+ this->name = loader_root.get("name", "?").asString();
+ this->dependencies = loader_root.get("depends on", "");
+}
+std::string Task::get_name() { return this->name; }
+Json::Value Task::get_dependencies() { return this->dependencies;}
+
+Plan::Plan( std::string filename ): JLoader( filename )
+{
+/* Plan loads a file and deserializes the Unit JSON object to Task types as a vector member
+ * Plan { vector }
+ */
+ Json::Value raw_tasks = this->get_root()["plan"];
+
+ for ( int index = 0; index < raw_tasks.size(); index++ )
+ {
+ this->tasks.push_back( Task( raw_tasks[index] ) );
+ }
+};
\ No newline at end of file
diff --git a/src/loaders/Plan.h b/src/loaders/Plan.h
new file mode 100644
index 0000000..7378c30
--- /dev/null
+++ b/src/loaders/Plan.h
@@ -0,0 +1,33 @@
+//
+// Created by phanes on 4/22/17.
+//
+
+#ifndef FTESTS_PLAN_H
+#define FTESTS_PLAN_H
+#include
+#include "../json/json.h"
+#include "JLoader.h"
+
+class Task
+{
+private:
+ std::string name;
+ Json::Value dependencies;
+
+public:
+ Task( Json::Value loader_root );
+ std::string get_name();
+ Json::Value get_dependencies();
+};
+
+class Plan: public JLoader
+{
+public:
+ using JLoader::JLoader;
+ std::vector tasks;
+ Plan( std::string filename );
+};
+
+
+
+#endif //FTESTS_PLAN_H
diff --git a/src/loaders.cpp b/src/loaders/Units.cpp
similarity index 50%
rename from src/loaders.cpp
rename to src/loaders/Units.cpp
index 06e0752..594f5d4 100644
--- a/src/loaders.cpp
+++ b/src/loaders/Units.cpp
@@ -1,41 +1,8 @@
-#include "loaders.h"
-#include
-
-inline bool exists(const std::string& name)
-{
- struct stat buffer;
- return (stat (name.c_str(), &buffer) == 0);
-}
-
-JLoader::JLoader( std::string filename )
-{
- Json::Value json_root;
- Json::Reader reader;
-
- if (! exists( filename ) )
- {
- std::cerr << "File '" << filename << "' does not exist.";
- exit(1);
- }
-
- std::ifstream jfile( filename, std::ifstream::binary );
-
- bool parsingSuccessful = reader.parse( jfile, this->json_root );
- if (! parsingSuccessful )
- {
- std::cerr << "Failed to parse " << filename << ":\n\t" << reader.getFormattedErrorMessages();
- std::exit( 1 );
- } else {
- std::cout << "Parsed " << filename << " with " << this->json_root.size() << " elements." << std::endl;
- }
-}
-
-Json::Value JLoader::get_root()
-{
- return this->json_root;
-}
-
+//
+// Created by phanes on 4/22/17.
+//
+#include "Units.h"
Unit::Unit( Json::Value loader_root )
{
this->name = loader_root.get("name", "?").asString();
@@ -92,43 +59,3 @@ Unit UnitHolder::select_unit(std::string provided_name)
return * returnable;
}
-
-
-Task::Task( Json::Value loader_root )
-{
- this->name = loader_root.get("name", "?").asString();
- this->dependencies = loader_root.get("depends on", "");
-}
-std::string Task::get_name() { return this->name; }
-Json::Value Task::get_dependencies() { return this->dependencies;}
-
-Plan::Plan( std::string filename ): JLoader( filename )
-{
-/* Plan loads a file and deserializes the Unit JSON object to Task types as a vector member
- * Plan { vector }
- */
- Json::Value raw_tasks = this->get_root()["plan"];
-
- for ( int index = 0; index < raw_tasks.size(); index++ )
- {
- this->tasks.push_back( Task( raw_tasks[index] ) );
- }
-};
-
-
-Conf::Conf( std::string filename ): JLoader( filename )
-{
- this->plan_path = this->get_root()["plan_path"].asString();
- this->units_path = this->get_root()["units_path"].asString();
-};
-
-std::string Conf::get_plan_path()
-{
- return this->plan_path;
-}
-
-std::string Conf::get_units_path()
-{
- return this->units_path;
-}
-
diff --git a/src/loaders/Units.h b/src/loaders/Units.h
new file mode 100644
index 0000000..41cfaf8
--- /dev/null
+++ b/src/loaders/Units.h
@@ -0,0 +1,45 @@
+//
+// Created by phanes on 4/22/17.
+//
+
+#ifndef FTESTS_UNITS_H
+#define FTESTS_UNITS_H
+
+#include
+#include "../json/json.h"
+#include "JLoader.h"
+
+class Unit
+{
+private:
+ std::string name;
+ std::string target;
+ std::string output;
+ std::string rectifier;
+ std::string active;
+ std::string required;
+ std::string rectify;
+
+public:
+ Unit( Json::Value loader_root );
+ std::string get_name();
+ std::string get_target();
+ std::string get_output();
+ std::string get_rectifier();
+ std::string get_active();
+ std::string get_required();
+ std::string get_rectify();
+};
+
+class UnitHolder: public JLoader
+{
+public:
+ using JLoader::JLoader;
+ std::vector units;
+ UnitHolder( std::string filename );
+ Unit select_unit( std::string provided_name );
+};
+
+
+
+#endif //FTESTS_UNITS_H
diff --git a/src/loaders/helpers.cpp b/src/loaders/helpers.cpp
new file mode 100644
index 0000000..f4f86cb
--- /dev/null
+++ b/src/loaders/helpers.cpp
@@ -0,0 +1,11 @@
+//
+// Created by phanes on 4/22/17.
+//
+
+#include "helpers.h"
+
+bool exists(const std::string& name)
+{
+ struct stat buffer;
+ return (stat (name.c_str(), &buffer) == 0);
+}
\ No newline at end of file
diff --git a/src/loaders/helpers.h b/src/loaders/helpers.h
new file mode 100644
index 0000000..a9dbce2
--- /dev/null
+++ b/src/loaders/helpers.h
@@ -0,0 +1,14 @@
+//
+// Created by phanes on 4/22/17.
+//
+
+#ifndef FTESTS_HELPERS_H
+#define FTESTS_HELPERS_H
+#include
+#include
+
+bool exists (const std::string& name);
+
+
+
+#endif //FTESTS_HELPERS_H
diff --git a/src/loaders/loaders.cpp b/src/loaders/loaders.cpp
new file mode 100644
index 0000000..e2feabc
--- /dev/null
+++ b/src/loaders/loaders.cpp
@@ -0,0 +1,3 @@
+#include "loaders.h"
+
+
diff --git a/src/loaders/loaders.h b/src/loaders/loaders.h
new file mode 100644
index 0000000..158089c
--- /dev/null
+++ b/src/loaders/loaders.h
@@ -0,0 +1,12 @@
+//
+// Created by phanes on 4/16/17.
+//
+#ifndef FTESTS_LOADERS_H
+#define FTESTS_LOADERS_H
+
+#include "JLoader.h"
+#include "Units.h"
+#include "Plan.h"
+#include "Conf.h"
+
+#endif //FTESTS_LOADERS_H