Moved goal and PROPERTY to core ontology, etc.

Boeing-Ontology/ontology/Boeing.sadl

@@ -34,12 +34,7 @@ confirms of SBVT_Result only has values of type SBVT_Test.
 ////////////////////////////////////// Moved from SRI ontology
 //AM: replaced author by wasAssociatedWith in DevelopSystemConOps
 //AM: dropped author in DevelopSystemArchitecture as we inherit wasAssociatedWith
-//AM: do we more granularity than just wasAssociatedWith
-//AM: relate to PIDS, SRS, SubDD
-//AM: see comment on line 55
-//AM: can RequirementSet "governs" more than just SYSTEM? (line 65): maybe we need a hierarchy for SYSTEM; maybe the restriction should be on REQUIREMENT
-//AM: should Requirement Sets be named collection?
-//AM reorder this file so PIDS etc. are moved lower; what is CSID related to?
+//AM: do we want more granularity than just wasAssociatedWith
 
      DevelopSystemConOps is a type of ACTIVITY.
        wasAssociatedWith of DevelopSystemConOps only has values of type AGENT.

RACK-Ontology/ontology/ANALYSIS.sadl

@@ -39,9 +39,7 @@ ANALYSIS
 
     analysisConfiguration (note "Parameters/options etc. for the tool used.") describes ANALYSIS with values of type ENTITY.
     analysisConfiguration is a type of used.
-
-    goal (note "Objective of an ANALYSIS") describes ANALYSIS with values of type ENTITY.
-    goal is a type of used.
+
 
 ANALYSIS_OUTPUT
     (note "Output of an ANALYSIS")

RACK-Ontology/ontology/PROCESS.sadl

@@ -17,9 +17,10 @@ OBJECTIVE
 	(note "An OBJECTIVE identifies tasks from a process for which evidence must be provided to show that the task has been completed. ") 
 	is a type of ENTITY.
 
-	satisfiedBy (note "An ACTIVITY that demonstrates that the OBJECTIVE has been satisfied.") describes OBJECTIVE with values of type THING.
+	satisfiedBy (note "An ACTIVITY that demonstrates that the OBJECTIVE has been satisfied.") describes OBJECTIVE with values of type ACTIVITY.
 
 PROPERTY 
 	(note "A general property that holds on the basis of some ANALYSIS") 
 	is a type of OBJECTIVE. 
 
+	partiallySupports (note "One or more PROPERTY may be needed to address an OBJECTIVE.") describes PROPERTY with values of type OBJECTIVE.

RACK-Ontology/ontology/PROV-S.sadl

@@ -62,4 +62,5 @@ ACTIVITY (note "An activity is something that occurs over a period of time and a
 	startedAtTime describes ACTIVITY with at most 1 value.
 	endedAtTime (note "The time an activity was ended") describes ACTIVITY with values of type dateTime.
 	endedAtTime describes ACTIVITY with at most 1 value.
+    goal (note "Purpose of the ACTIVITY") describes ACTIVITY with values of type ENTITY.
     used (note "Usage is the beginning of utilizing an entity by an activity. Before usage, the activity had not begun to utilize this entity and could not have been affected by the entity. (Note: This definition is formulated for a given usage; it is permitted for an activity to have used a same entity multiple times.)") describes ACTIVITY with values of type ENTITY.

SRI-Ontology/ontology/SRI.sadl

@@ -24,8 +24,6 @@ import "http://arcos.AH-64D/Boeing".
 // In SRI_Tool, dropped 2 lines on toolQualificationData as we already have 
 //		wasQualifiedBy: TOOL -> ENTITY
 //		dropped toolSummaryDescription as existing "description" property can be used
-// rename xx to be something like PropertyBasedAnalysisOutput? 
-//		do we need analysisDiagnostics?
 // goalProperty: move to core ontology?
 // verificationOjective: looks like an Objective? then move verificationObjective to core as parentObjective
 // replaced "used" by "analysisInput" when it is used on an ANALYSIS
@@ -92,10 +90,10 @@ ToolQualificationData
       //   result of type ANALYSIS_RESULT defined in the base RACK ontology is used as is
       // new properties for ANALYSIS_OUTPUT
 
-//AM introducing a subClass of ANALYSIS_OUTPUT and moving properties to the new subClass; rename the subClass
-xx is a type of ANALYSIS_OUTPUT.      
-      analysisDiagnostics (note "counter examples, other diagnostics") describes xx with values of type string.  
-      goal of xx only has values of type GenericProperty. //AM 10/12
+//AM introducing a subClass of ANALYSIS and moving properties to the new subClass
+SRI_ANALYSIS is a type of ANALYSIS.     
+      analysisDiagnostics (note "counter examples, other diagnostics") describes SRI_ANALYSIS with values of type string.  
+      goal of SRI_ANALYSIS only has values of type GenericProperty. //AM 10/13
 
       // Note: base RACK ontology class ANALYSIS_ANNOTATION is not used since we capture the property independently and not as part of ANALYSIS_OUTPUT