Merge pull request #45 from Spyderisk/43-iot-sensor-control-issue

Refactored Process-Sensor relationships to address issue #43.

csv/ConstructionPattern.csv

@@ -91,7 +91,7 @@ hasPriority,URI,package,label,iterate,maxIterations,usesLoopback,usesParallel,ha
 4321,domain#CP-DcTh+DS,package#IoT,DcTh+DS,FALSE,0,FALSE,FALSE,domain#MP-DcTh,"Finds each IoT Thing device and its control input Data, and adds an onboard communication process that serves the Data."
 4330,domain#CP-Pa-uCo+Rel,package#IoT,Pa-uCo+Rel,FALSE,0,FALSE,FALSE,domain#MP-Pa-uCo,"Finds a client Process that amends an IoT Controller, and adds relationships between the client and the onboard communication Process and control input Data."
 4331,domain#CP-PuCo+Rel,package#IoT,PuCo+Rel,FALSE,0,FALSE,FALSE,domain#MP-PuCo,"Finds a client Process that updates an IoT Controller, and adds relationships between the client and the onboard communication Process and Data."
-4340,domain#CP-PaSe+Rel,package#IoT,PaSe+Rel,FALSE,0,FALSE,FALSE,domain#MP-PaSe,"Finds a client Process that amends control input to an IoT Sensor, along with its onboard simple communication Process and Data, and adds relationships between the client and the onboard simple communication Process and Data."
+4340,domain#CP-PcSe+Rel,package#IoT,PcSe+Rel,FALSE,0,FALSE,FALSE,domain#MP-PcSe,"Finds a client Process that alters control input to an IoT Sensor, along with its onboard simple communication Process and Data, and adds relationships between the client and the onboard simple communication Process and Data."
 4341,domain#CP-PrSe+Rel,package#IoT,PrSe+Rel,FALSE,0,FALSE,FALSE,domain#MP-PrSe,"Finds an IoT Sensor sending data to a (not really client) Process, and adds a relationship between the onboard simple IoT communication Process and the client Process."
 4342,domain#CP-Pp-uSe+Rel,package#IoT,Pp-uSe+Rel,FALSE,0,FALSE,FALSE,domain#MP-Pp-uSe,"Finds a client Process that polls (but does not read) an IoT Sensor to obtain data, and adds relationships between the client and the onboard simple communication Process and Data."
 4343,domain#CP-PuSe+Rel,package#IoT,PuSe+Rel,FALSE,0,FALSE,FALSE,domain#MP-PuSe,"Finds a client Process that reads data from an IoT Sensor, and adds relationships between the client and the onboard simple communication Process and Data."

csv/ConstructionPatternLinks.csv

@@ -442,10 +442,10 @@ package#IoT,domain#CP-HuiSe+Rel,domain#Link-Human-interactsWith-Process
 package#IoT,domain#CP-HuiSe+Rel,domain#Link-Human-viewsData-Output
 package#IoT,domain#CP-HuiSe+Rel,domain#Link-Process-creates-Input
 package#IoT,domain#CP-HumThP-m+m,domain#Link-Human-manages-Process
-package#IoT,domain#CP-PaSe+Rel,domain#Link-Client-amends-Data
-package#IoT,domain#CP-PaSe+Rel,domain#Link-Client-uses-SimpleProcess
 package#IoT,domain#CP-Pa-uCo+Rel,domain#Link-Client-amends-Data
 package#IoT,domain#CP-Pa-uCo+Rel,domain#Link-Client-uses-Process
+package#IoT,domain#CP-PcSe+Rel,domain#Link-Client-amends-Data
+package#IoT,domain#CP-PcSe+Rel,domain#Link-Client-uses-SimpleProcess
 package#IoT,domain#CP-Pp-uSe+Rel,domain#Link-Client-receives-Data
 package#IoT,domain#CP-Pp-uSe+Rel,domain#Link-Client-uses-SimpleProcess
 package#IoT,domain#CP-PrSe+Rel,domain#Link-Client-receives-Data

csv/MatchingPattern.csv

@@ -265,8 +265,8 @@ package#IoT,domain#MP-HuiCo,HuiCo,"Finds the control input for an IoT Controller
 package#IoT,domain#MP-HuiSe,HuiSe,"Finds the control input and sensed output for an IoT Sensor, which is being used interactively by a Human, plus the interactive process that creates the output.",domain#R-HuiSe,FALSE,FALSE
 package#IoT,domain#MP-HuiThaS-S,HuiThaS-S,Finds a Human that has access to a space and uses an IoT Thing which has no specified location.,domain#R-HuiThaS,FALSE,FALSE
 package#IoT,domain#MP-HumThP-m,HumThP-m,Finds a Human managing a Thing with an unmanaged onboard process.,domain#R-HumThP,FALSE,FALSE
-package#IoT,domain#MP-PaSe,PaSe,"Finds a client Process that amends control input to an IoT Sensor, along with its onboard simple communication Process and Data.",domain#R-PaSe,FALSE,FALSE
 package#IoT,domain#MP-Pa-uCo,Pa-uCo,"Finds a client Process that amends (but does not update) an IoT Controller, along with its control input Data and onboard  communication Process.",domain#R-PaCo,FALSE,TRUE
+package#IoT,domain#MP-PcSe,PcSe,"Finds a client Process that alters control input to an IoT Sensor, along with its onboard simple communication Process and Data.",domain#R-PcSe,FALSE,FALSE
 package#IoT,domain#MP-Pp-uSe,Pp-uSe,"Finds a client Process that polls (but does not read) an IoT Sensor, along with its onboard simple communication Process and Data.",domain#R-PpSe,FALSE,TRUE
 package#IoT,domain#MP-PrSe,PrSe,"Finds a client Process that receives data from an IoT Sensor, along with its onboard simple communication Process and Data.",domain#R-PrSe,FALSE,TRUE
 package#IoT,domain#MP-PuCo,PuCo,"Finds a client Process that updates an IoT Controller, along with its control input Data and onboard  communication Process.",domain#R-PuCo,FALSE,FALSE

csv/ObjectProperty.csv

@@ -69,13 +69,15 @@ package#DataLifecycleInference,domain#revPath,revPath,Signifies that the data us
 package#DataLifecycleInference,domain#toProc,toProc,The DataPath represents a chain of process-process communications enabling the use of data obtained from the Process.,TRUE,FALSE,FALSE,FALSE,TRUE,TRUE
 package#DataLifecycleInference,domain#usesDataPath,usesDataPath,Relationship between a data flow and a data path.,TRUE,FALSE,FALSE,FALSE,TRUE,TRUE
 package#IoT,domain#amendsController,amends,"The Process uses and alters the value of the control settings for the Controller, and is not blocked if it cannot access these settings.",FALSE,TRUE,TRUE,FALSE,FALSE,FALSE
-package#IoT,domain#amendsSensor,amendsSensor,"The Process uses and alters the value of the control settings for the Sensor, and is not blocked if it cannot access these settings.",FALSE,TRUE,TRUE,FALSE,FALSE,FALSE
+package#IoT,domain#amendsSensor,amends,"The Process initiates reading the Sensor, providing control settings as input and receiving sensed data as output. The Process is not blocked if it cannot access the Sensor.",FALSE,TRUE,TRUE,FALSE,FALSE,FALSE
+package#IoT,domain#controlsSensor,controlsSensor,"The Process uses and alters the value of the control settings for the Controller, and is not blocked if it cannot access these settings.",FALSE,TRUE,TRUE,FALSE,FALSE,FALSE
 package#IoT,domain#controlsThing,controlsThing,Relationship from control input Data to a Thing whose physical actuator or measurement hardware is controlled or configured by the Data.,FALSE,TRUE,TRUE,FALSE,FALSE,FALSE
-package#IoT,domain#pollsSensor,polls,"The Process updates the Sensor configuration and reads data from the Sensor, and is not blocked if the Sensor is not available.",FALSE,TRUE,TRUE,FALSE,FALSE,FALSE
-package#IoT,domain#readsSensor,reads,"The Process updates the configuration and reads data from the Sensor, and is blocked if the Sensor is not available.",FALSE,TRUE,TRUE,FALSE,FALSE,FALSE
+package#IoT,domain#pollsSensor,polls,"The Process initiates reading the Sensor, receiving sensed data as output. The Process is not blocked if it cannot access the Sensor.",FALSE,TRUE,TRUE,FALSE,FALSE,FALSE
+package#IoT,domain#readsSensor,reads,"The Process initiates reading the Sensor, receiving sensed data as output. The Process is blocked if it cannot access the Sensor.",FALSE,TRUE,TRUE,FALSE,FALSE,FALSE
 package#IoT,domain#receivesFromSensor,receives,"The Sensor sends readings to the Process, and neither end is blocked should this not be possible.",FALSE,TRUE,TRUE,FALSE,FALSE,FALSE
 package#IoT,domain#senses,senses,Relationship from an IoT Sensor to Data produced by its measurement hardware.,FALSE,TRUE,TRUE,FALSE,FALSE,FALSE
 package#IoT,domain#updatesController,updates,"The Process uses and alters the value of the control settings for the Controller, and is blocked if it cannot access these settings.",FALSE,TRUE,TRUE,FALSE,FALSE,FALSE
+package#IoT,domain#updatesSensor,updates,"The Process initiates reading the Sensor, providing control settings as input and receiving sensed data as output. The Process is blocked if it cannot access the Sensor.",FALSE,FALSE,TRUE,FALSE,FALSE,FALSE
 package#Legal,domain#hasController,hasController,The Stakeholder is legally responsible for use of the Data to the data subject and data regulator.,FALSE,TRUE,TRUE,FALSE,FALSE,FALSE
 package#Legal,domain#responsibleFor,responsibleFor,The Stakeholder is legally responsible for regulating access to Data by a Process.,TRUE,FALSE,FALSE,FALSE,TRUE,FALSE
 package#Legal,domain#subjectTo,subjectTo,An asset is regulated by the laws of the Jurisdiction.,FALSE,TRUE,TRUE,FALSE,TRUE,FALSE

csv/ObjectPropertyDomains.csv

@@ -74,6 +74,7 @@ package#DataLifecycleInference,domain#usesDataPath,domain#DataChannel
 package#DataLifecycleInference,domain#usesDataPath,domain#DataFlow
 package#IoT,domain#amendsController,domain#Process
 package#IoT,domain#amendsSensor,domain#Process
+package#IoT,domain#controlsSensor,domain#Process
 package#IoT,domain#controlsThing,domain#Data
 package#IoT,domain#pollsSensor,domain#Process
 package#IoT,domain#readsSensor,domain#Process

csv/ObjectPropertyParents.csv

@@ -24,8 +24,11 @@ package#DataLifecycle,domain#crudu,domain#crudr
 package#DataLifecycle,domain#flowsIn,domain#flows
 package#DataLifecycle,domain#flowsOut,domain#flows
 package#DataLifecycle,domain#noDX,domain#noDU
-package#IoT,domain#pollsSensor,domain#amendsSensor
+package#IoT,domain#amendsSensor,domain#controlsSensor
+package#IoT,domain#amendsSensor,domain#pollsSensor
 package#IoT,domain#readsSensor,domain#pollsSensor
+package#IoT,domain#updatesSensor,domain#controlsSensor
+package#IoT,domain#updatesSensor,domain#readsSensor
 package#Network,domain#interactsWith,domain#interactsRemotelyWith
 package#Network,domain#locatedIn,domain#mayBeIn
 package#Network,domain#uses,domain#usesService

csv/ObjectPropertyRanges.csv

@@ -71,6 +71,7 @@ package#DataLifecycleInference,domain#toProc,domain#Process
 package#DataLifecycleInference,domain#usesDataPath,domain#DataPath
 package#IoT,domain#amendsController,domain#Controller
 package#IoT,domain#amendsSensor,domain#Sensor
+package#IoT,domain#controlsSensor,domain#Sensor
 package#IoT,domain#controlsThing,domain#Thing
 package#IoT,domain#interactsWith,domain#Thing
 package#IoT,domain#pollsSensor,domain#Sensor

csv/RootPattern.csv

@@ -222,7 +222,7 @@ package#IoT,domain#R-HuiThaS,HuiThaS,Finds a Human that uses an IoT Thing and ha
 package#IoT,domain#R-HumThP,HumThP,Finds a Human managing a Thing with an onboard process.,FALSE,FALSE
 package#IoT,domain#R-IoT,IoT,"Finds a solo IoT Thing. Not used at present, but reserved for a future extension.",FALSE,FALSE
 package#IoT,domain#R-PaCo,PaCo,"Finds a client Process that amends an IoT Controller, along with its control input Data and onboard  communication Process.",FALSE,FALSE
-package#IoT,domain#R-PaSe,PaSe,"Finds a client Process that amends control input to an IoT Sensor, along with its onboard simple communication Process and Data.",FALSE,FALSE
+package#IoT,domain#R-PcSe,PcSe,"Finds a client Process that alters control input to an IoT Sensor, along with its onboard simple communication Process and Data.",FALSE,FALSE
 package#IoT,domain#R-PpSe,PpSe,"Finds a client Process that polls an IoT Sensor, along with its onboard simple communication Process and Data.",FALSE,FALSE
 package#IoT,domain#R-PrSe,PrSe,"Finds a an IoT Sensor sending data to a Process, along with the onboard simple communication Process and Data.",FALSE,FALSE
 package#IoT,domain#R-PuCo,PuCo,"Finds a client Process that updates an IoT Controller, along with its control input Data and onboard  communication Process.",FALSE,FALSE

csv/RootPatternLinks.csv

@@ -1090,10 +1090,10 @@ package#IoT,domain#R-PaCo,domain#Link-Client-amendsController-Controller
 package#IoT,domain#R-PaCo,domain#Link-Controller-hosts-Process
 package#IoT,domain#R-PaCo,domain#Link-Data-controlsThing-Controller
 package#IoT,domain#R-PaCo,domain#Link-Process-serves-Data
-package#IoT,domain#R-PaSe,domain#Link-Client-amendsSensor-Sensor
-package#IoT,domain#R-PaSe,domain#Link-Data-controlsThing-Sensor
-package#IoT,domain#R-PaSe,domain#Link-Sensor-hosts-SimpleProcess
-package#IoT,domain#R-PaSe,domain#Link-SimpleProcess-serves-Data
+package#IoT,domain#R-PcSe,domain#Link-Client-controlsSensor-Sensor
+package#IoT,domain#R-PcSe,domain#Link-Data-controlsThing-Sensor
+package#IoT,domain#R-PcSe,domain#Link-Sensor-hosts-SimpleProcess
+package#IoT,domain#R-PcSe,domain#Link-SimpleProcess-serves-Data
 package#IoT,domain#R-PpSe,domain#Link-Client-pollsSensor-Sensor
 package#IoT,domain#R-PpSe,domain#Link-Sensor-hosts-SimpleProcess
 package#IoT,domain#R-PpSe,domain#Link-Sensor-senses-Data

csv/RootPatternNodes.csv

@@ -1038,10 +1038,10 @@ package#IoT,domain#R-PaCo,domain#Node-Client-Process,TRUE
 package#IoT,domain#R-PaCo,domain#Node-Controller-Controller,TRUE
 package#IoT,domain#R-PaCo,domain#Node-Data-Data,TRUE
 package#IoT,domain#R-PaCo,domain#Node-Process-Process,TRUE
-package#IoT,domain#R-PaSe,domain#Node-Client-Process,TRUE
-package#IoT,domain#R-PaSe,domain#Node-Data-Data,TRUE
-package#IoT,domain#R-PaSe,domain#Node-Sensor-Sensor,TRUE
-package#IoT,domain#R-PaSe,domain#Node-SimpleProcess-DataService,TRUE
+package#IoT,domain#R-PcSe,domain#Node-Client-Process,TRUE
+package#IoT,domain#R-PcSe,domain#Node-Data-Data,TRUE
+package#IoT,domain#R-PcSe,domain#Node-Sensor-Sensor,TRUE
+package#IoT,domain#R-PcSe,domain#Node-SimpleProcess-DataService,TRUE
 package#IoT,domain#R-PpSe,domain#Node-Client-Process,TRUE
 package#IoT,domain#R-PpSe,domain#Node-Data-Data,TRUE
 package#IoT,domain#R-PpSe,domain#Node-Sensor-Sensor,TRUE