commit c186ea09ab56cf5672c11be90e42746b3a10a5ce
parent 4ae43c1929e7397be4c1f186433ebab65d570d23
Author: Bob Haugen <bob.haugen@gmail.com>
Date: Thu, 1 Aug 2019 14:01:51 -0500
Merge pull request #527 from valueflows/flow-qty
flowQuantity (for now)
Diffstat:
6 files changed, 20 insertions(+), 34 deletions(-)
diff --git a/examples/claim.yaml b/examples/claim.yaml
@@ -16,7 +16,7 @@
provider: https://bob.example/
receiver: https://manufacturing.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q192047 # machining
- quantifiedAs:
+ flowQuantity:
qudt:unit: unit:Hour
qudt:numericValue: 7
hasBeginning: 2018-10-14T8:00:00-0:00
@@ -30,7 +30,7 @@
provider: https://manufacturing.example/
receiver: https://bob.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q1104069 # Canadian dollar
- quantifiedAs:
+ claimedQuantity:
qudt:unit: unit:Number
qudt:numericValue: 140
dcterms:created: 2018-10-14T15:30:00-0:00
@@ -45,7 +45,7 @@
provider: https://bob.example/
receiver: https://manufacturing.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q1104069 # Canadian dollar
- quantifiedAs:
+ flowQuantity:
qudt:unit: unit:Number
qudt:numericValue: 260 # here Bob received income for more than one work event (others not included in the example)
time:inXSDDateTimeStamp: 2018-10-25T09:30:00-0:00
diff --git a/examples/exch-agreement.yaml b/examples/exch-agreement.yaml
@@ -23,7 +23,7 @@
provider: https://alice.example/
receiver: https://bob.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q89 # apples
- quantifiedAs:
+ flowQuantity:
qudt:unit: unit: Kilogram
qudt:numericValue: 50
@@ -34,7 +34,7 @@
provider: https://bob.example/
receiver: https://alice.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q5977438 # soft apple cider
- quantifiedAs:
+ flowQuantity:
qudt:unit: unit: Liter
qudt:numericValue: 10
@@ -51,7 +51,7 @@
provider: https://store.example/
receiver: https://carol.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q47107 # bucket
- quantifiedAs:
+ flowQuantity:
qudt:unit: unit: Number
qudt:numericValue: 1
@@ -63,6 +63,6 @@
receiver: https://store.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q4917 # US dollar
resourceInventoriedAs: carol:e56fd654-7b94-4d96-8e60-de39e08329a7 # Carol's bank account
- quantifiedAs:
+ flowQuantity:
qudt:unit: unit: Number
qudt:numericValue: 5
diff --git a/examples/fulfill-satisfy.yaml b/examples/fulfill-satisfy.yaml
@@ -65,7 +65,7 @@
provider: https://bob.example/
receiver: https://manufacturing.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q192047 # machining
- affectedQuantity:
+ flowQuantity:
qudt:unit: unit:Hour
qudt:numericValue: 4
hasBeginning: 2018-10-14T8:00:00-0:00
@@ -85,7 +85,7 @@
provider: https://bob.example/
receiver: https://manufacturing.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q192047 # machining
- affectedQuantity:
+ flowQuantity:
qudt:unit: unit:Hour
qudt:numericValue: 4
hasBeginning: 2018-10-14T13:00:00-0:00
diff --git a/examples/process-manufacturing.yaml b/examples/process-manufacturing.yaml
@@ -53,7 +53,7 @@
provider: https://manufacturing.example/
receiver: https://manufacturing.example/
resourceInventoriedAs: mfg:3129ca8b-fcda-45be-bbda-294dc924d3b9 # plywood sheets
- affectedQuantity:
+ flowQuantity:
qudt:unit: unit:Number
qudt:numericValue: 3
@@ -64,7 +64,7 @@
provider: https://manufacturing.example/
receiver: https://manufacturing.example/
resourceInventoriedAs: mfg:52f0e212-3c4f-4d27-b345-5e964c135824 # CNC machine
- affectedQuantity:
+ flowQuantity:
qudt:unit: unit:Hour
qudt:numericValue: 3.5
@@ -75,7 +75,7 @@
provider: https://makezine.com/
receiver: https://manufacturing.example/
resourceInventoriedAs: mfg:6b97b1be-8e07-44ac-82e5-214f1b2aaf33 # desk design specification
- affectedQuantity:
+ flowQuantity:
qudt:unit: unit:Number
qudt:numericValue: 1
@@ -86,7 +86,7 @@
provider: https://alice.example/
receiver: https://manufacturing.example/
resourceClassifiedAs: https://www.wikidata.org/wiki/Q192047 # machining
- affectedQuantity:
+ flowQuantity:
qudt:unit: unit:Hour
qudt:numericValue: 7
@@ -97,7 +97,7 @@
provider: https://manufacturing.example/
receiver: https://manufacturing.example/
resourceInventoriedAs: mfg:e1721a61-cd47-4556-84b9-8b1b81da15bf # desk
- affectedQuantity:
+ flowQuantity:
qudt:unit: unit:Number
qudt:numericValue: 1
diff --git a/examples/process-workflow.yaml b/examples/process-workflow.yaml
@@ -32,7 +32,7 @@
provider: https://alice.example/
receiver: https://auto-repair.example/
resourceInventoriedAs: alice:e1721a61-cd47-4556-84b9-8b1b81da15bf
- affectedQuantity:
+ flowQuantity:
qudt:unit: unit:Number
qudt:numericValue: 1
@@ -43,7 +43,7 @@
provider: https://auto-repair.example/
receiver: https://alice.example/
resourceInventoriedAs: alice:e1721a61-cd47-4556-84b9-8b1b81da15bf
- affectedQuantity:
+ flowQuantity:
qudt:unit: unit:Number
qudt:numericValue: 1
diff --git a/release-doc-in-process/all_vf.TTL b/release-doc-in-process/all_vf.TTL
@@ -304,26 +304,12 @@ vf:currentQuantity a owl:ObjectProperty ;
vs:term_status "unstable" ;
rdfs:comment "The current amount and unit of the economic resource. This can be stored or derived from economic events affecting the resource" .
-vf:affectedQuantity a owl:ObjectProperty ;
- rdfs:label "affected quantity" ;
- rdfs:domain vf:EconomicEvent ;
- rdfs:range qudt:QuantityValue ;
- vs:term_status "unstable" ;
- rdfs:comment "The amount and unit of the event. This is the quantity that could be used to increment or decrement a resource, depending on the type of resource and type of event." .
-
-vf:committedQuantity a owl:ObjectProperty ;
- rdfs:label "committed quantity" ;
- rdfs:domain vf:Commitment ;
- rdfs:range qudt:QuantityValue ;
- vs:term_status "unstable" ;
- rdfs:comment "The amount and unit of the commitment." .
-
-vf:intendedQuantity a owl:ObjectProperty ;
- rdfs:label "intended quantity" ;
- rdfs:domain vf:Intent ;
+vf:flowQuantity a owl:ObjectProperty ;
+ rdfs:label "flow quantity" ;
+ rdfs:domain [ owl:unionOf (vf:EconomicEvent vf:Commitment vf:Intent) ] ;
rdfs:range qudt:QuantityValue ;
vs:term_status "unstable" ;
- rdfs:comment "The amount and unit of the intent." .
+ rdfs:comment "The amount and unit of the economic event, commitment, or intent." .
vf:fulfilledQuantity a owl:ObjectProperty ;
rdfs:label "fulfilled quantity" ;
