diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 4d11719..70940ec 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -36,8 +36,7 @@
-
-
+
@@ -46,11 +45,10 @@
-
-
+
+
-
@@ -90,11 +88,11 @@
-
+
-
-
+
+
@@ -102,14 +100,13 @@
-
+
-
-
+
@@ -269,9 +266,9 @@
-
-
+
+
@@ -592,12 +589,12 @@
1491540343823
-
+
-
+
@@ -614,14 +611,14 @@
-
+
-
+
-
+
@@ -830,34 +827,32 @@
-
+
-
-
+
+
-
-
+
-
-
+
+
-
+
-
-
+
+
-
-
+
diff --git a/cmake-build-debug/CMakeFiles/Progress/1 b/cmake-build-debug/CMakeFiles/Progress/1
deleted file mode 100644
index 7b4d68d..0000000
--- a/cmake-build-debug/CMakeFiles/Progress/1
+++ /dev/null
@@ -1 +0,0 @@
-empty
\ No newline at end of file
diff --git a/cmake-build-debug/CMakeFiles/Progress/2 b/cmake-build-debug/CMakeFiles/Progress/2
deleted file mode 100644
index 7b4d68d..0000000
--- a/cmake-build-debug/CMakeFiles/Progress/2
+++ /dev/null
@@ -1 +0,0 @@
-empty
\ No newline at end of file
diff --git a/cmake-build-debug/CMakeFiles/Progress/count.txt b/cmake-build-debug/CMakeFiles/Progress/count.txt
deleted file mode 100644
index b8626c4..0000000
--- a/cmake-build-debug/CMakeFiles/Progress/count.txt
+++ /dev/null
@@ -1 +0,0 @@
-4
diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/main.cpp.o b/cmake-build-debug/CMakeFiles/ftests.dir/main.cpp.o
new file mode 100644
index 0000000..da8997e
Binary files /dev/null and b/cmake-build-debug/CMakeFiles/ftests.dir/main.cpp.o differ
diff --git a/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders.cpp.o b/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders.cpp.o
new file mode 100644
index 0000000..01831fc
Binary files /dev/null and b/cmake-build-debug/CMakeFiles/ftests.dir/src/loaders.cpp.o differ
diff --git a/cmake-build-debug/ftests b/cmake-build-debug/ftests
index 673bed4..e705f7c 100755
Binary files a/cmake-build-debug/ftests and b/cmake-build-debug/ftests differ
diff --git a/main.cpp b/main.cpp
index dfd5f71..ab9c5ce 100644
--- a/main.cpp
+++ b/main.cpp
@@ -8,16 +8,11 @@
void json_file_to_json_obj(std::string filename)
{
- Unit jsonLoader = Unit(filename);
+ Conf jsonLoader = Conf(filename);
Json::Value root = jsonLoader.get_root();
const std::string planpath = root.get("plan_path", NULL).asString();
-/*
- for ( int index = 0; index < arrtest.size(); index++ )
- {
- std::cout << arrtest[index] << "\n";
- }
-*/
+
std::cout << planpath;
}
diff --git a/src/loaders.cpp b/src/loaders.cpp
index 2664a8b..c41c27a 100644
--- a/src/loaders.cpp
+++ b/src/loaders.cpp
@@ -39,18 +39,23 @@ JLoader::JLoader( std::string filename )
}
}
-
-
-
Json::Value JLoader::get_root()
{
return this->json_root;
}
-
-
Unit::Unit( std::string filename ): JLoader( filename )
{
};
+
+Plan::Plan( std::string filename ): JLoader( filename )
+{
+
+};
+
+Conf::Conf( std::string filename ): JLoader( filename )
+{
+
+};
diff --git a/src/loaders.h b/src/loaders.h
index e2ba065..ebd3df8 100644
--- a/src/loaders.h
+++ b/src/loaders.h
@@ -22,32 +22,33 @@ class JLoader
Json::Value get_root();
};
-class Unit: public Jloader
+class Unit: public JLoader
{
private:
Json::Value json_root;
public:
using JLoader::JLoader;
- Unit( std::string filename ): JLoader( filename );
- Json::Value get_root(): JLoader::get_root();
+ Unit( std::string filename );
+};
+
+class Plan: public JLoader
+{
+ private:
+ Json::Value json_root;
+ public:
+ using JLoader::JLoader;
+ Plan( std::string filename );
};
-/*class Plan: Jloader
+class Conf: public JLoader
{
- Plan()
- {
-
- };
+ private:
+ Json::Value json_root;
+ public:
+ using JLoader::JLoader;
+ Conf( std::string filename );
};
-class Conf: Jloader
-{
- Conf()
- {
-
- };
-};*/
-
#endif //FTESTS_LOADERS_H