From a7019614896fdd3e29b9a28f6a8cfd2c1b365983 Mon Sep 17 00:00:00 2001 From: Benjamin Paassen Date: Sun, 1 Mar 2015 20:47:25 +0100 Subject: Renamed domain to ontology. --- test/core/model/TestAdvanced.hpp | 68 ++++++++++++++++++++-------------------- 1 file changed, 34 insertions(+), 34 deletions(-) (limited to 'test/core/model/TestAdvanced.hpp') diff --git a/test/core/model/TestAdvanced.hpp b/test/core/model/TestAdvanced.hpp index 71379d2..c92effa 100644 --- a/test/core/model/TestAdvanced.hpp +++ b/test/core/model/TestAdvanced.hpp @@ -20,19 +20,19 @@ #define _MODEL_TEST_ADVANCED_HPP_ #include -#include +#include #include #include "TestDocumentBuilder.hpp" namespace ousia { -static Rooted resolveDescriptor(Handle domain, +static Rooted resolveDescriptor(Handle ontology, const std::string &className) { // use the actual resolve method. std::vector resolved = - domain->resolve(&RttiTypes::StructuredClass, className); + ontology->resolve(&RttiTypes::StructuredClass, className); // take the first valid result. for (auto &r : resolved) { return r.node.cast(); @@ -42,53 +42,53 @@ static Rooted resolveDescriptor(Handle domain, } /** - * This constructs the "heading" domain given the book domain. + * This constructs the "heading" ontology given the book ontology. */ -static Rooted constructHeadingDomain(Manager &mgr, +static Rooted constructHeadingOntology(Manager &mgr, Handle sys, - Handle bookDomain, + Handle bookOntology, Logger &logger) { - // set up domain node. - Rooted domain{new Domain(mgr, sys, "headings")}; + // set up ontology node. + Rooted ontology{new Ontology(mgr, sys, "headings")}; // set up cardinality (every section may have at most one heading). Cardinality card; card.merge({0, 1}); // set up heading StructuredClass. Rooted heading{ - new StructuredClass(mgr, "heading", domain, card, {nullptr}, true)}; + new StructuredClass(mgr, "heading", ontology, card, {nullptr}, true)}; // as field want to reference the field of paragraph. - Rooted p = resolveDescriptor(bookDomain, "paragraph"); + Rooted p = resolveDescriptor(bookOntology, "paragraph"); heading->addFieldDescriptor(p->getFieldDescriptor(), logger); // create a new field for headings in each section type. std::vector secclasses{"book", "section", "subsection", "paragraph"}; for (auto &s : secclasses) { - Rooted desc = resolveDescriptor(bookDomain, s); + Rooted desc = resolveDescriptor(bookOntology, s); Rooted heading_field = desc->createFieldDescriptor(logger, FieldDescriptor::FieldType::SUBTREE, "heading", true).first; heading_field->addChild(heading); } - return domain; + return ontology; } /** - * This constructs the "list" domain given the book domain. + * This constructs the "list" ontology given the book ontology. */ -static Rooted constructListDomain(Manager &mgr, +static Rooted constructListOntology(Manager &mgr, Handle sys, - Handle bookDomain, + Handle bookOntology, Logger &logger) { - // set up domain node. - Rooted domain{new Domain(mgr, sys, "list")}; + // set up ontology node. + Rooted ontology{new Ontology(mgr, sys, "list")}; // get book.paragraph - Rooted p = resolveDescriptor(bookDomain, "paragraph"); + Rooted p = resolveDescriptor(bookOntology, "paragraph"); // set up item StructuredClass; Rooted item{new StructuredClass( - mgr, "item", domain, Cardinality::any(), {nullptr}, false)}; + mgr, "item", ontology, Cardinality::any(), {nullptr}, false)}; // as field we want to reference the field of paragraph. item->addFieldDescriptor(p->getFieldDescriptor(), logger); @@ -96,28 +96,28 @@ static Rooted constructListDomain(Manager &mgr, std::vector listTypes{"ol", "ul"}; for (auto &listType : listTypes) { Rooted list{new StructuredClass( - mgr, listType, domain, Cardinality::any(), p, false)}; + mgr, listType, ontology, Cardinality::any(), p, false)}; Rooted list_field{new FieldDescriptor(mgr, list)}; list_field->addChild(item); } - return domain; + return ontology; } /** - * This constructs the "emphasis" domain. + * This constructs the "emphasis" ontology. */ -static Rooted constructEmphasisDomain(Manager &mgr, +static Rooted constructEmphasisOntology(Manager &mgr, Handle sys, Logger &logger) { - // set up domain node. - Rooted domain{new Domain(mgr, sys, "emphasis")}; + // set up ontology node. + Rooted ontology{new Ontology(mgr, sys, "emphasis")}; // create AnnotationClasses - Rooted em{new AnnotationClass(mgr, "emphasized", domain)}; + Rooted em{new AnnotationClass(mgr, "emphasized", ontology)}; - Rooted strong{new AnnotationClass(mgr, "strong", domain)}; + Rooted strong{new AnnotationClass(mgr, "strong", ontology)}; - return domain; + return ontology; } static bool addText(Logger &logger, Handle doc, @@ -173,17 +173,17 @@ static bool addAnnotation(Logger &logger, Handle doc, /** * This constructs a more advanced book document using not only the book - * domain but also headings, emphasis and lists. + * ontology but also headings, emphasis and lists. */ static Rooted constructAdvancedDocument(Manager &mgr, Logger &logger, - Handle bookDom, - Handle headingDom, - Handle listDom, - Handle emphasisDom) + Handle bookDom, + Handle headingDom, + Handle listDom, + Handle emphasisDom) { // Start with the (empty) document. Rooted doc{new Document(mgr, "kant_was_ist_aufklaerung.oxd")}; - doc->referenceDomains({bookDom, headingDom, listDom, emphasisDom}); + doc->referenceOntologys({bookDom, headingDom, listDom, emphasisDom}); // Add the root. Rooted book = -- cgit v1.2.3