From d2d908534db7593e927d006dff3d147fa9604a6c Mon Sep 17 00:00:00 2001 From: bu Date: Wed, 20 May 2020 14:55:49 +0200 Subject: [PATCH] Small corrections --- .../CENELEC_50128/CENELEC_50128.thy | 93 ++++++++++--------- .../scholarly_paper/DOF-scholarly_paper.sty | 59 ++++++------ 2 files changed, 76 insertions(+), 76 deletions(-) diff --git a/src/ontologies/CENELEC_50128/CENELEC_50128.thy b/src/ontologies/CENELEC_50128/CENELEC_50128.thy index d9ab1b4..4a06e00 100644 --- a/src/ontologies/CENELEC_50128/CENELEC_50128.thy +++ b/src/ontologies/CENELEC_50128/CENELEC_50128.thy @@ -666,89 +666,90 @@ verification and validation activities to be undertaken effectively.\ section\ Design related Categories \ doc_class design_item = - description :: string + description :: string -datatype design_kind = unit | module | protocol +datatype design_kind = unit | module | protocol doc_class interface = design_item + - kind :: design_kind + kind :: design_kind section\ Requirements-Analysis related Categories \ doc_class test_item = - nn :: "string option" + nn :: "string option" doc_class test_specification = test_item + - short_goal :: string + short_goal :: string doc_class test_case = test_item + - descr :: string + descr :: string doc_class test_result = test_item + verdict :: bool remarks :: string covvrit :: test_coverage_criterion -datatype test_environment_kind = hardware_in_the_loop ("hil") - | simulated_hardware_in_the_loop ("shil") +datatype test_environment_kind = hardware_in_the_loop ("hil") + | simulated_hardware_in_the_loop ("shil") -doc_class test_environment = test_item + +doc_class test_environment = test_item + descr :: string kind :: test_environment_kind <= shil -doc_class test_tool = test_item + +doc_class test_tool = test_item + descr :: string -doc_class test_requirement = test_item + +doc_class test_requirement = test_item + descr :: string -doc_class test_adm_role = test_item + +doc_class test_adm_role = test_item + name :: string doc_class test_documentation = - no :: "nat" - accepts "test_specification ~~ \test_case~~test_result\\<^sup>+ ~~ \test_environment||test_tool\\<^sup>+ ~~ - \test_requirement\ ~~ test_adm_role" - accepts " test_specification ~~ \test_case~~test_result\\<^sup>+ ~~ \test_environment||test_tool\\<^sup>+ ~~ - \test_requirement \ ~~ test_adm_role" + no :: "nat" + accepts "test_specification ~~ + \test_case~~test_result\\<^sup>+ ~~ + \test_environment||test_tool\\<^sup>+ ~~ + \test_requirement\ ~~ + test_adm_role" + accepts "test_specification ~~ + \test_case~~test_result\\<^sup>+ ~~ + \test_environment||test_tool\\<^sup>+ ~~ + \test_requirement \ ~~ + test_adm_role" + - section\ META : Testing and Validation \ text\Test : @{semi_formal_content \COTS\}\ -ML\ -DOF_core.read_cid_global @{theory} "requirement"; -DOF_core.read_cid_global @{theory} "SRAC"; -DOF_core.is_defined_cid_global "SRAC" @{theory}; -DOF_core.is_defined_cid_global "EC" @{theory}; -\ +ML +\ DOF_core.read_cid_global @{theory} "requirement"; + DOF_core.read_cid_global @{theory} "SRAC"; + DOF_core.is_defined_cid_global "SRAC" @{theory}; + DOF_core.is_defined_cid_global "EC" @{theory}; \ -ML\ -DOF_core.is_subclass @{context} "CENELEC_50128.EC" "CENELEC_50128.EC"; -DOF_core.is_subclass @{context} "CENELEC_50128.SRAC" "CENELEC_50128.EC"; -DOF_core.is_subclass @{context} "CENELEC_50128.EC" "CENELEC_50128.SRAC"; -DOF_core.is_subclass @{context} "CENELEC_50128.EC" "CENELEC_50128.test_requirement"; -\ +ML +\ DOF_core.is_subclass @{context} "CENELEC_50128.EC" "CENELEC_50128.EC"; + DOF_core.is_subclass @{context} "CENELEC_50128.SRAC" "CENELEC_50128.EC"; + DOF_core.is_subclass @{context} "CENELEC_50128.EC" "CENELEC_50128.SRAC"; + DOF_core.is_subclass @{context} "CENELEC_50128.EC" "CENELEC_50128.test_requirement"; \ -ML\val {docobj_tab={maxano, tab=ref_tab},docclass_tab=class_tab,...} = DOF_core.get_data @{context}; -Symtab.dest ref_tab; -Symtab.dest class_tab; -\ +ML +\ val {docobj_tab={maxano, tab=ref_tab},docclass_tab=class_tab,...} = DOF_core.get_data @{context}; + Symtab.dest ref_tab; + Symtab.dest class_tab; \ -ML\ -val internal_data_of_SRAC_definition = DOF_core.get_attributes_local "SRAC" @{context} -\ +ML +\ val internal_data_of_SRAC_definition = DOF_core.get_attributes_local "SRAC" @{context} \ -ML\ -DOF_core.read_cid_global @{theory} "requirement"; -Syntax.parse_typ @{context} "requirement"; -val Type(t,_) = Syntax.parse_typ @{context} "requirement" handle ERROR _ => dummyT; -Syntax.read_typ @{context} "hypothesis" handle _ => dummyT; -Proof_Context.init_global; -\ +ML +\ DOF_core.read_cid_global @{theory} "requirement"; + Syntax.parse_typ @{context} "requirement"; + val Type(t,_) = Syntax.parse_typ @{context} "requirement" handle ERROR _ => dummyT; + Syntax.read_typ @{context} "hypothesis" handle _ => dummyT; + Proof_Context.init_global; \ -end - +end \ No newline at end of file diff --git a/src/ontologies/scholarly_paper/DOF-scholarly_paper.sty b/src/ontologies/scholarly_paper/DOF-scholarly_paper.sty index 626625b..898cd6e 100644 --- a/src/ontologies/scholarly_paper/DOF-scholarly_paper.sty +++ b/src/ontologies/scholarly_paper/DOF-scholarly_paper.sty @@ -365,36 +365,35 @@ } % An experiment in inheritance of the default behaviour. -%\newisadof{text.scholarly_paper.definition}% -%[label=,type=% -% , scholarly_paper.math_content.short_name =% -% , scholarly_paper.math_content.mcc =% -% , Isa_COL.text_element.level =% -% , Isa_COL.text_element.referentiable =% -% , Isa_COL.text_element.variants =% -% , scholarly_paper.text_section.main_author =% -% , scholarly_paper.text_section.fixme_list =% -% , scholarly_paper.technical.definition_list =% -% , scholarly_paper.technical.status =% -% ] -% [1] -% {% -% \begin{text.scholarly_paper.math_content}% -% [label=\commandkey{label},type=\commandkey{type}% -% , scholarly_paper.math_content.short_name =\commandkey{scholarly_paper.math_content.short_name}% -% , scholarly_paper.math_content.mcc =\commandkey{scholarly_paper.math_content.mcc}% -% , Isa_COL.text_element.level =\commandkey{Isa_COL.text_element.level}% -% , Isa_COL.text_element.referentiable =\commandkey{Isa_COL.text_element.referentiable}% -% , Isa_COL.text_element.variants =\commandkey{Isa_COL.text_element.variants}% -% , scholarly_paper.text_section.main_author =\commandkey{scholarly_paper.text_section.main_author}% -% , scholarly_paper.text_section.fixme_list =\commandkey{scholarly_paper.text_section.fixme_list}% -% , scholarly_paper.technical.definition_list =\commandkey{scholarly_paper.technical.definition_list}% -% , scholarly_paper.technical.status =\commandkey{scholarly_paper.technical.status}% -% ] -% #1% -% \end{text.scholarly_paper.math_content}% -% } -% +% \newisadof{text.scholarly_paper.definition}% +% [label=,type=% +% , scholarly_paper.math_content.short_name =% +% , scholarly_paper.math_content.mcc =% +% , Isa_COL.text_element.level =% +% , Isa_COL.text_element.referentiable =% +% , Isa_COL.text_element.variants =% +% , scholarly_paper.text_section.main_author =% +% , scholarly_paper.text_section.fixme_list =% +% , scholarly_paper.technical.definition_list =% +% , scholarly_paper.technical.status =% +% ] +% [1] +% {% +% \cscommand{text.scholarly_paper.math_content}% +% [label=\commandkey{label},type=\commandkey{type}% +% , scholarly_paper.math_content.short_name =\commandkey{scholarly_paper.math_content.short_name}% +% , scholarly_paper.math_content.mcc =\commandkey{scholarly_paper.math_content.mcc}% +% , Isa_COL.text_element.level =\commandkey{Isa_COL.text_element.level}% +% , Isa_COL.text_element.referentiable =\commandkey{Isa_COL.text_element.referentiable}% +% , Isa_COL.text_element.variants =\commandkey{Isa_COL.text_element.variants}% +% , scholarly_paper.text_section.main_author =\commandkey{scholarly_paper.text_section.main_author}% +% , scholarly_paper.text_section.fixme_list =\commandkey{scholarly_paper.text_section.fixme_list}% +% , scholarly_paper.technical.definition_list =\commandkey{scholarly_paper.technical.definition_list}% +% , scholarly_paper.technical.status =\commandkey{scholarly_paper.technical.status}% +% ] +% {#1}% +% } + %%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%% %% Besser: Einfach durchreichen wg Vererbung ! \newisadof{text.scholarly_paper.lemma}%