moved superclass axioms to ActivityInPlan from Activity

@@ -36,43 +36,58 @@
   rdfs:label "Dg phase 1"^^xsd:string ;
   rdfs:label "Project phase 1"^^xsd:string ;
   rdfs:subClassOf :PossibleIndividual ;
+  owl:equivalentClass <http://data.posccaesar.org/rdl/RDS3149> ;
+.
+:Activity101inPlanVersion2forProjectP
+  rdf:type :ActivityInPlan ;
+  rdf:type owl:Class ;
+  :hasRiskFactorForPlan :HeightWork ;
+  rdfs:label "Activity 101 in plan version 2 for project P"^^xsd:string ;
+  rdfs:subClassOf :Activity ;
+.
+:ActivityCarriedOutOnHCsystems
+  rdf:type :ActivityRiskFactor ;
+  rdf:type owl:Class ;
+  rdfs:label "Activity carried out on HCsystems"^^xsd:string ;
+  rdfs:subClassOf :Activity ;
+.
+:ActivityConstraint
+  rdf:type owl:Class ;
+  rdfs:comment "A Constraint in which an Activity or Milestone is linked to other Activities (or Milestones) that must be performed (completely or partially) before it can be performed."^^xsd:string ;
+  rdfs:label "Activity constraint"^^xsd:string ;
+  rdfs:subClassOf :Constraint ;
+.
+:ActivityForWhichESDPermitIsRequired
+  rdf:type :ActivityRiskFactor ;
+  rdf:type owl:Class ;
+  rdfs:label "Activity for which ESDPermit is required"^^xsd:string ;
+  rdfs:subClassOf :Activity ;
+.
+:ActivityForWhichEntryPermitIsRequired
+  rdf:type :ActivityRiskFactor ;
+  rdf:type owl:Class ;
+  rdfs:label "Activity for which entry permit is required"^^xsd:string ;
+  rdfs:subClassOf :Activity ;
+.
+:ActivityForWhichJobSafetyAnalysisIsRequired
+  rdf:type :ActivityRiskFactor ;
+  rdf:type owl:Class ;
+  rdfs:label "Activity for which job safety analysis is required"^^xsd:string ;
+  rdfs:subClassOf :Activity ;
+.
+:ActivityInPlan
+  rdf:type owl:Class ;
+  rdfs:comment "An Activity that has its role within a larger PlanForActivity as a criterion for membership. An ActivityInPlan is part of a PlanForActivity, with defined Constraints, Duration, Schedule Dates, Resources and Results."^^xsd:string ;
+  rdfs:label "Activity in Plan"^^xsd:string ;
+  rdfs:subClassOf :PlanForActivity ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
-      :shouldBeInternalAndExternalRef "true"^^xsd:boolean ;
-      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :WorkOrder ;
-      owl:onProperty :correspondsToPlan ;
-    ] ;
-  rdfs:subClassOf [
-      rdf:type owl:Restriction ;
-      :shouldUseAnyUri "true"^^xsd:boolean ;
-      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :Result ;
-      owl:onProperty :hasResult ;
-    ] ;
-  rdfs:subClassOf [
-      rdf:type owl:Restriction ;
-      :shouldUseRef "true"^^xsd:boolean ;
       owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
       owl:onClass :Calendar ;
       owl:onProperty :hasCalendar ;
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
-      :shouldUseRef "true"^^xsd:boolean ;
-      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :Activity ;
-      owl:onProperty :hasParentActivity ;
-    ] ;
-  rdfs:subClassOf [
-      rdf:type owl:Restriction ;
-      :shouldUseRef "true"^^xsd:boolean ;
-      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :FreeField ;
-      owl:onProperty :hasFreeField ;
-    ] ;
-  rdfs:subClassOf [
-      rdf:type owl:Restriction ;
       owl:maxQualifiedCardinality "1"^^xsd:nonNegativeInteger ;
       owl:onClass :Contractor ;
       owl:onProperty :hasMainContractor ;
@@ -98,12 +113,24 @@
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :Activity ;
+      owl:onProperty :hasParentActivity ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
       owl:onClass :ActivityRiskFactor ;
       owl:onProperty :hasRisk ;
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :ActivityRiskFactor ;
+      owl:onProperty :hasRiskFactorForPlan ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
       owl:onClass :CompletelyFreeField ;
       owl:onProperty :hasCompletelyFreeFieldDefinition ;
     ] ;
@@ -128,136 +155,98 @@
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :Phase ;
-      owl:onProperty :partOfPhase ;
+      owl:onClass :FreeField ;
+      owl:onProperty :hasFreeField ;
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :ResourceValue ;
-      owl:onProperty :hasResource ;
+      owl:onClass :MaterialOrderStatus ;
+      owl:onProperty :hasMaterialOrderStatus ;
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :Responsible ;
-      owl:onProperty :hasResponsible ;
+      owl:onClass :Organization ;
+      owl:onProperty :hasPlannedMainContractor ;
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :ScheduleForActivityInPlan ;
-      owl:onProperty :hasSchedule ;
+      owl:onClass :Organization ;
+      owl:onProperty :hasPlannedOperator ;
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :Status ;
-      owl:onProperty :hasActiveStatus ;
+      owl:onClass :PersonOrOrganization ;
+      owl:onProperty :hasPlannedSubContractor ;
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onDataRange xsd:date ;
-      owl:onProperty :hasOperatorsRequiredEndDate ;
+      owl:onClass :Phase ;
+      owl:onProperty :partOfPhase ;
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onDataRange xsd:decimal ;
-      owl:onProperty :hasActivityActualWeight ;
+      owl:onClass :ResourceValue ;
+      owl:onProperty :hasResource ;
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onDataRange xsd:decimal ;
-      owl:onProperty :hasActivityEstimatedWeight ;
+      owl:onClass :Responsible ;
+      owl:onProperty :hasResponsible ;
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onDataRange xsd:decimal ;
-      owl:onProperty :hasActivityWorkVolume ;
+      owl:onClass :Result ;
+      owl:onProperty :hasResult ;
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
-      owl:onDataRange xsd:string ;
-      owl:onProperty :hasDescription ;
-      owl:qualifiedCardinality "1"^^xsd:nonNegativeInteger ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onClass :ScheduleForActivityInPlan ;
+      owl:onProperty :hasSchedule ;
     ] ;
-  owl:equivalentClass <http://data.posccaesar.org/rdl/RDS3149> ;
-.
-:Activity101inPlanVersion2forProjectP
-  rdf:type :ActivityInPlan ;
-  rdf:type owl:Class ;
-  :hasRiskFactorForPlan :HeightWork ;
-  rdfs:label "Activity 101 in plan version 2 for project P"^^xsd:string ;
-  rdfs:subClassOf :Activity ;
-.
-:ActivityCarriedOutOnHCsystems
-  rdf:type :ActivityRiskFactor ;
-  rdf:type owl:Class ;
-  rdfs:label "Activity carried out on HCsystems"^^xsd:string ;
-  rdfs:subClassOf :Activity ;
-.
-:ActivityConstraint
-  rdf:type owl:Class ;
-  rdfs:comment "A Constraint in which an Activity or Milestone is linked to other Activities (or Milestones) that must be performed (completely or partially) before it can be performed."^^xsd:string ;
-  rdfs:label "Activity constraint"^^xsd:string ;
-  rdfs:subClassOf :Constraint ;
-.
-:ActivityForWhichESDPermitIsRequired
-  rdf:type :ActivityRiskFactor ;
-  rdf:type owl:Class ;
-  rdfs:label "Activity for which ESDPermit is required"^^xsd:string ;
-  rdfs:subClassOf :Activity ;
-.
-:ActivityForWhichEntryPermitIsRequired
-  rdf:type :ActivityRiskFactor ;
-  rdf:type owl:Class ;
-  rdfs:label "Activity for which entry permit is required"^^xsd:string ;
-  rdfs:subClassOf :Activity ;
-.
-:ActivityForWhichJobSafetyAnalysisIsRequired
-  rdf:type :ActivityRiskFactor ;
-  rdf:type owl:Class ;
-  rdfs:label "Activity for which job safety analysis is required"^^xsd:string ;
-  rdfs:subClassOf :Activity ;
-.
-:ActivityInPlan
-  rdf:type owl:Class ;
-  rdfs:comment "An Activity that has its role within a larger PlanForActivity as a criterion for membership. An ActivityInPlan is part of a PlanForActivity, with defined Constraints, Duration, Schedule Dates, Resources and Results."^^xsd:string ;
-  rdfs:label "Activity in Plan"^^xsd:string ;
-  rdfs:subClassOf :PlanForActivity ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :ActivityRiskFactor ;
-      owl:onProperty :hasRiskFactorForPlan ;
+      owl:onClass :Status ;
+      owl:onProperty :hasActiveStatus ;
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :MaterialOrderStatus ;
-      owl:onProperty :hasMaterialOrderStatus ;
+      owl:onClass :WorkOrder ;
+      owl:onProperty :correspondsToPlan ;
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :Organization ;
-      owl:onProperty :hasPlannedMainContractor ;
+      owl:onDataRange xsd:date ;
+      owl:onProperty :hasOperatorsRequiredEndDate ;
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :Organization ;
-      owl:onProperty :hasPlannedOperator ;
+      owl:onDataRange xsd:decimal ;
+      owl:onProperty :hasActivityActualWeight ;
     ] ;
   rdfs:subClassOf [
       rdf:type owl:Restriction ;
       owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
-      owl:onClass :PersonOrOrganization ;
-      owl:onProperty :hasPlannedSubContractor ;
+      owl:onDataRange xsd:decimal ;
+      owl:onProperty :hasActivityWorkVolume ;
+    ] ;
+  rdfs:subClassOf [
+      rdf:type owl:Restriction ;
+      owl:minQualifiedCardinality "0"^^xsd:nonNegativeInteger ;
+      owl:onDataRange xsd:string ;
+      owl:onProperty :hasDescription ;
     ] ;
   owl:disjointWith :PlanForILAP ;
 .