diff --git a/model-lddtool/src/test/resources/github795b/occultation_prediction_som_manifest.xml b/model-lddtool/src/test/resources/github795b/occultation_prediction_som_manifest.xml index baf16b3e..580ef6cb 100644 --- a/model-lddtool/src/test/resources/github795b/occultation_prediction_som_manifest.xml +++ b/model-lddtool/src/test/resources/github795b/occultation_prediction_som_manifest.xml @@ -16,8 +16,8 @@ 1.23.0.0 Product_External - - + French, R.G.; Souami, D. + Mace, M.J.T.; Gordon, M.K.; Tiscareno, M.S. 2023 10.17189/m9sk-g963 jupiter diff --git a/model-ontology/src/ontology/Data/UpperModel.pins b/model-ontology/src/ontology/Data/UpperModel.pins index 55bf85ee..8b957401 100644 --- a/model-ontology/src/ontology/Data/UpperModel.pins +++ b/model-ontology/src/ontology/Data/UpperModel.pins @@ -1,4 +1,4 @@ -; Wed Nov 13 14:47:11 EST 2024 +; Fri Nov 15 19:30:51 EST 2024 ; ;+ (version "3.5") ;+ (build "Build 663") @@ -286,6 +286,41 @@ (identifier "sequence_number") (specMesg "The sequence number of the second axis of an Array_2D_Image must be set to 2.")) +([http%3A%2F%2Fpds.nasa.gov%2Finfomodel%2Fpds%23.pds%3ACitation_Information.100004635] of Schematron_Rule + + (alwaysInclude "false") + (attrNameSpaceNC "pds") + (attrTitle "author_list") + (classNameSpaceNC "pds") + (classSteward "pds") + (classTitle "Citation_Information") + (has_Schematron_Assert + [http%3A%2F%2Fpds.nasa.gov%2Finfomodel%2Fpds%23.pds%3ACitation_Information.100004635.101] + [http%3A%2F%2Fpds.nasa.gov%2Finfomodel%2Fpds%23.pds%3ACitation_Information.100004635.102]) + (identifier "pds:Citation_Information") + (isMissionOnly "false") + (roleId "TBD_roleId") + (type "TBD_type") + (xpath "pds:Citation_Information")) + +([http%3A%2F%2Fpds.nasa.gov%2Finfomodel%2Fpds%23.pds%3ACitation_Information.100004635.101] of Schematron_Assert + + (assertMsg "The presence of \"pds:doi\" requires at least one of either \"List_Author\" or \"List_Editor\" classes.") + (assertStmt "if (pds:doi) then (pds:author_list or pds:editor_list or pds:List_Author or pds:List_Editor) else true()") + (assertType "RAW") + (attrTitle "author_list") + (identifier "author_list") + (specMesg "The presence of \"pds:doi\" requires at least one of either \"List_Author\" or \"List_Editor\" classes.")) + +([http%3A%2F%2Fpds.nasa.gov%2Finfomodel%2Fpds%23.pds%3ACitation_Information.100004635.102] of Schematron_Assert + + (assertMsg "The pds:List_Author and pds:List_Editor classes should not be used in conjunction with the deprecated pds:author_list and pds:editor_list attributes.") + (assertStmt "if ((pds:author_list or pds:editor_list) and (pds:List_Author or pds:List_Editor)) then false() else true()") + (assertType "RAW") + (attrTitle "author_list") + (identifier "author_list") + (specMesg "The pds:List_Author and pds:List_Editor classes should not be used in conjunction with the deprecated pds:author_list and pds:editor_list attributes.")) + ([http%3A%2F%2Fpds.nasa.gov%2Finfomodel%2Fpds%23.pds%3ACitation_Information%2Fpds%3Adescription.100002517] of Schematron_Rule (alwaysInclude "false") diff --git a/model-ontology/src/ontology/Data/UpperModel.pont b/model-ontology/src/ontology/Data/UpperModel.pont index 630a459c..7570780c 100644 --- a/model-ontology/src/ontology/Data/UpperModel.pont +++ b/model-ontology/src/ontology/Data/UpperModel.pont @@ -1,4 +1,4 @@ -; Wed Nov 13 14:47:11 EST 2024 +; Fri Nov 15 19:30:51 EST 2024 ; ;+ (version "3.5") ;+ (build "Build 663") @@ -11511,7 +11511,7 @@ ;+ (cardinality 1 1) (create-accessor read-write))) -(defclass Units_of_Amount_Of_Substance "Units_of_Amount_Of_Substance is a unit in which a quantity of chemically unique and identifiable particles (atoms, molecules, ions, etc is measured." +(defclass Units_of_Amount_Of_Substance "Units_of_Amount_Of_Substance is a magnitude of quantity of chemically unique and identifiable particles (atoms, molecules, ions, etc.)." (is-a Unit_Of_Measure) (role concrete) (single-slot type diff --git a/model-ontology/src/ontology/Data/UpperModel.pprj b/model-ontology/src/ontology/Data/UpperModel.pprj index 449dfa35..492b0b8e 100644 --- a/model-ontology/src/ontology/Data/UpperModel.pprj +++ b/model-ontology/src/ontology/Data/UpperModel.pprj @@ -1,4 +1,4 @@ -; Wed Nov 13 14:47:11 EST 2024 +; Fri Nov 15 19:30:52 EST 2024 ; ;+ (version "3.5") ;+ (build "Build 663") @@ -6,10 +6,10 @@ ([BROWSER_SLOT_NAMES] of Property_List (properties - [UpperModel_ProjectKB_Class73] - [UpperModel_ProjectKB_Class74] - [UpperModel_ProjectKB_Class75] - [UpperModel_ProjectKB_Class76])) + [UpperModel_ProjectKB_Class135] + [UpperModel_ProjectKB_Class136] + [UpperModel_ProjectKB_Class137] + [UpperModel_ProjectKB_Class138])) ([CLSES_TAB] of Widget @@ -423,9 +423,6 @@ (x 0) (y 120)) -([KB_206517_Class0] of Map -) - ([KB_663782_Class0] of Map ) @@ -551,6 +548,9 @@ (name "instances_file_name") (string_value "UpperModel.pins")) +([KB_893422_Class0] of Map +) + ([PAL_FORM_WIDGET] of Widget (height 476) @@ -856,6 +856,26 @@ (property_list [UpperModel_ProjectKB_Class14]) (widget_class_name "edu.stanford.smi.protegex.server_changes.prompt.UsersTab")) +([UpperModel_ProjectKB_Class135] of String + + (name "ChangeLog") + (string_value "date")) + +([UpperModel_ProjectKB_Class136] of String + + (name ":INSTANCE-ANNOTATION") + (string_value "%3AANNOTATION-TEXT")) + +([UpperModel_ProjectKB_Class137] of String + + (name ":PAL-CONSTRAINT") + (string_value "%3APAL-NAME")) + +([UpperModel_ProjectKB_Class138] of String + + (name ":META-CLASS") + (string_value "%3ANAME")) + ([UpperModel_ProjectKB_Class14] of Property_List ) @@ -1129,26 +1149,6 @@ (property_list [UpperModel_ProjectKB_Class8]) (widget_class_name "edu.stanford.smi.protegex.widget.pal.PalQueriesTab")) -([UpperModel_ProjectKB_Class73] of String - - (name "ChangeLog") - (string_value "date")) - -([UpperModel_ProjectKB_Class74] of String - - (name ":INSTANCE-ANNOTATION") - (string_value "%3AANNOTATION-TEXT")) - -([UpperModel_ProjectKB_Class75] of String - - (name ":PAL-CONSTRAINT") - (string_value "%3APAL-NAME")) - -([UpperModel_ProjectKB_Class76] of String - - (name ":META-CLASS") - (string_value "%3ANAME")) - ([UpperModel_ProjectKB_Class8] of Property_List )