summaryrefslogtreecommitdiff
path: root/src/model/domain
diff options
context:
space:
mode:
Diffstat (limited to 'src/model/domain')
-rw-r--r--src/model/domain/Anchor.hpp36
-rw-r--r--src/model/domain/ClassSet.hpp (renamed from src/model/domain/Anchor.cpp)11
-rw-r--r--src/model/domain/Domain.hpp41
3 files changed, 33 insertions, 55 deletions
diff --git a/src/model/domain/Anchor.hpp b/src/model/domain/Anchor.hpp
deleted file mode 100644
index 66ff8eb..0000000
--- a/src/model/domain/Anchor.hpp
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- Ousía
- Copyright (C) 2014 Benjamin Paaßen, Andreas Stöckel
-
- This program is free software: you can redistribute it and/or modify
- it under the terms of the GNU General Public License as published by
- the Free Software Foundation, either version 3 of the License, or
- (at your option) any later version.
-
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- GNU General Public License for more details.
-
- You should have received a copy of the GNU General Public License
- along with this program. If not, see <http://www.gnu.org/licenses/>.
-*/
-
-#ifndef _ANCHOR_HPP_
-#define _ANCHOR_HPP_
-
-#include <model/GraphNode.hpp>
-
-namespace ousia {
-namespace domain {
-
-class Anchor : public GraphNode {
-
-public:
- using GraphNode::GraphNode;
-
-};
-}
-}
-
-#endif /* _ANCHOR_HPP_ */
diff --git a/src/model/domain/Anchor.cpp b/src/model/domain/ClassSet.hpp
index e153161..ebfe508 100644
--- a/src/model/domain/Anchor.cpp
+++ b/src/model/domain/ClassSet.hpp
@@ -16,12 +16,17 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <model/domain/Anchor.hpp>
-
namespace ousia {
namespace domain {
-//This class is fully specified by its header.
+#include "Class.hpp";
+
+class ClassSet {
+
+private:
+ std::vector<Class> classes;
+
+};
}
}
diff --git a/src/model/domain/Domain.hpp b/src/model/domain/Domain.hpp
index dd5ee4d..957ae4a 100644
--- a/src/model/domain/Domain.hpp
+++ b/src/model/domain/Domain.hpp
@@ -16,34 +16,42 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-#ifndef _DOMAIN_HPP_
-#define _DOMAIN_HPP_
+#ifndef _OUSIA_MODEL_DOMAIN_DOMAIN_HPP_
+#define _OUSIA_MODEL_DOMAIN_DOMAIN_HPP_
-#include <memory>
-#include <string>
-#include <vector>
+//#include <memory>
+//#include <string>
+//#include <vector>
#include <model/GraphNode.hpp>
-#include "Class.hpp"
-#include "Structure.hpp"
-#include "Category.hpp"
-#include "Layer.hpp"
+//#include "Class.hpp"
+//#include "Structure.hpp"
+//#include "Category.hpp"
+//#include "Layer.hpp"
namespace ousia {
+namespace model {
namespace domain {
class Domain : public GraphNode {
private:
- std::shared_ptr<Class> root;
- std::vector<std::shared_ptr<Structure>> structures;
- std::vector<std::shared_ptr<Category>> categories;
- std::vector<std::shared_ptr<Layer>> layers;
+// std::shared_ptr<Class> root;
+// std::vector<std::shared_ptr<Structure>> structures;
+// std::vector<std::shared_ptr<Category>> categories;
+// std::vector<std::shared_ptr<Layer>> layers;
public:
- std::shared_ptr<Class>& getRoot()
+ Domain(std::shared_ptr<GraphNode> parent = nullptr,
+ const std::string &name = "") :
+ GraphNode(GraphNodeType::Domain, parent, name)
+ {
+ // Do nothing here
+ }
+
+/* std::shared_ptr<Class>& getRoot()
{
return root;
}
@@ -61,12 +69,13 @@ public:
std::vector<std::shared_ptr<Layer>>& getLayers()
{
return layers;
- }
+ }*/
};
}
}
+}
-#endif /* _DOMAIN_HPP_ */
+#endif /* _OUSIA_MODEL_DOMAIN_DOMAIN_HPP_ */