commit 663464dabc01cb863cf8b9f35cfd643034a1f1f8 parent 56c8a98ce23d4a06adcb9dd07763573d1f26bc1f Author: Lynn Foster <foster.j.lynn@gmail.com> Date: Thu, 8 Aug 2019 10:54:28 -0500 Examples fixes (#551) * all resource specs into VF in resource ex * resolve comments on examples/pics; fix ResourceSpecification ref Diffstat:
21 files changed, 137 insertions(+), 87 deletions(-)
diff --git a/docs/examples/.ex-resource.md.kate-swp b/docs/examples/.ex-resource.md.kate-swp Binary files differ. diff --git a/docs/examples/ex-exchange.md b/docs/examples/ex-exchange.md @@ -17,7 +17,7 @@ An exchange agreement with commitments. #### Retail exchange -An exchange without prior agreement. +An exchange without prior commitments. Note we are still using the Agreement to tie together the reciprocal events, even there were no commitments ahead of time.  diff --git a/examples/plan-from-recipe.yaml b/examples/plan-from-recipe.yaml @@ -3,7 +3,7 @@ '@context': - https://git.io/vf-examples-jsonld-context - alice: https://alice.example/ - sensor: https://sencorica.example/ + sensor: https://sensorica.example/ open: https://openhardware.example '@id': rgh:valueflows/valueflows/master/examples/plan-from-recipe.yaml @@ -15,6 +15,7 @@ '@type': ResourceSpecification name: Delivery fiber uri: https://openhardware.example/delivery-fiber + skos:note: Optical fiber that connects 2 devices. - '@id': urn:uuid:b90b0b77-09a2-42e2-8bd4-e9ae2c1c6172 '@type': RecipeResource @@ -69,8 +70,8 @@ independentDemandOf: sensor:8e5fe80d-a769-4bd5-89e5-2136d33eab9f outputOf: sensor:02b39a30-3e04-4305-9656-7f261aa63c84 action: produce - provider: https://sensor.example/ - receiver: https://sensor.example/ + provider: https://sensorica.example/ + receiver: https://sensorica.example/ resourceConformsTo: urn:uuid:b90b0b77-09a2-42e2-8bd4-e9ae2c1c6172 # delivery fiber flowQuantity: qudt:unit: unit:Meter @@ -86,8 +87,8 @@ '@type': Commitment inputOf: sensor:02b39a30-3e04-4305-9656-7f261aa63c84 action: consume - provider: https://sensor.example/ - receiver: https://sensor.example/ + provider: https://sensorica.example/ + receiver: https://sensorica.example/ resourceClassifiedAs: wd:Q162 # optical fiber flowQuantity: qudt:unit: unit:Meter @@ -99,7 +100,7 @@ inputOf: sensor:02b39a30-3e04-4305-9656-7f261aa63c84 action: work provider: https://alice.example/ - receiver: https://sensor.example/ + receiver: https://sensorica.example/ resourceClassifiedAs: wd:Q640621 # optical engineering flowQuantity: qudt:unit: unit:Hour diff --git a/examples/resource.yaml b/examples/resource.yaml @@ -13,6 +13,8 @@ name: Tractor - LifeTrac 6 uri: https://www.opensourceecology.org/portfolio/tractor/ image: https://www.opensourceecology.org/wp-content/uploads/2014/02/Tractor_gray.png + defaultUnit: unit:Number + substitutable: true resourceClassifiedAs: https://www.wikidata.org/wiki/Q39495 skos:note: A versatile, 4-wheel drive, hydraulically-driven tractor with 18 to 200 horsepower capacity for agriculture, construction and other utility duties. @@ -20,23 +22,43 @@ '@type': EconomicResource name: Tractor - LifeTrac 6 trackingIdentifier: 889jcd00s # the serial number assigned by the manufacturer - resourceConformsTo: ose:822b6baf-d66f-45a0-98f2-57450e2aec23 + conformsTo: ose:822b6baf-d66f-45a0-98f2-57450e2aec23 currentQuantity: qudt:unit: unit:Number qudt:numericValue: 1 + - '@id': farm:8baa8ff7-9c1e-4586-ae7b-79d620a3cac9 + '@type': ResourceSpecification + name: Carrots organic + defaultUnit: unit:Kilogram + substitutable: true + resourceClassifiedAs: https://www.wikidata.org/wiki/Q39495 + skos:note: Organic loose carrots without tops. + - '@id': farm:07819789-dd51-44c3-b35c-9210165bc832 '@type': EconomicResource name: Loose organic carrots - trackingIdentifier: 54988 # the lot number assigned by the farm - classifiedAs: https://www.wikidata.org/wiki/Q81 # carrot + lot: farm:fd399b37-0740-4a68-a184-1e655021ca21 # the lot number assigned by the farm + conformsTo: farm:8baa8ff7-9c1e-4586-ae7b-79d620a3cac9 currentQuantity: qudt:unit: unit:Kilogram qudt:numericValue: 650 skos:note: Medium size, clean, harvested after the first frost, will store well. + - '@id': farm:fd399b37-0740-4a68-a184-1e655021ca21 + '@type': dfc:ProductBatch + dfc:batchNumber: 3409888 + + - '@id': farm:68cabaf3-deb8-4bd5-a439-798263abe35a + '@type': ResourceSpecification + name: Farm documentation + defaultUnit: unit:Number + substitutable: false + resourceClassifiedAs: https://www.wikidata.org/wiki/Q49848 # document + skos:note: Any of the documentation produced and/or used by the farm. + - '@id': farm:a7e94dde-2997-451e-a7e1-8d364d5e6dee '@type': EconomicResource name: Intern orientation instructions - classifiedAs: https://www.wikidata.org/wiki/Q49848 # document + conformsTo: farm:68cabaf3-deb8-4bd5-a439-798263abe35a uri: https://farm.example/docs/intern-orientation.odt diff --git a/examples/transport-with-transfer.yaml b/examples/transport-with-transfer.yaml @@ -38,7 +38,7 @@ '@type': Agreement skos:note: exchange transportation service for currency - - '@id': urn:uuid:8baa8ff7-9c1e-4586-ae7b-79d620a3cac9 + - '@id': urn:uuid:33e8933b-ff73-4a01-964a-ca7a98893083 '@type': Commitment action: transfer resourceClassifedAs: wd:Q4917 # US Dollar @@ -248,7 +248,7 @@ - '@id': urn:uuid:fbff9852-36ca-4364-a943-bc0b49e1cab5 '@type': Fulfillment - fulfills: urn:uuid:8baa8ff7-9c1e-4586-ae7b-79d620a3cac9 # the commitment + fulfills: urn:uuid:33e8933b-ff73-4a01-964a-ca7a98893083 # the commitment fulfilledBy: urn:uuid:8baa8ff7-9c1e-4586-ae7b-79d620a3cac9 # the economic event fulfilledQuantity: qudt:unit: unit:Number diff --git a/release-doc-in-process/all_vf.TTL b/release-doc-in-process/all_vf.TTL @@ -642,7 +642,7 @@ vf:resourceConformsTo a owl:ObjectProperty ; rdfs:label "resource conforms to" ; rdfs:domain [ owl:unionOf (vf:Commitment vf:Intent vf:EconomicEvent vf:Claim vf:RecipeResource) ] ; - rdfs:range [ owl:unionOf (vf:ResourceSpecification owl:Thing) ] ; + rdfs:range vf:ResourceSpecification ; vs:term_status "unstable" ; rdfs:comment "The primary resource specification or definition of an existing or potential economic resource. A resource will have only one, as this specifies exactly what the resource is. If not a vf:ResourceSpecification, this can be a link to another specification." . diff --git a/release-doc-in-process/ful-sat.png b/release-doc-in-process/ful-sat.png Binary files differ. diff --git a/release-doc-in-process/ful-sat.xml b/release-doc-in-process/ful-sat.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<mxfile modified="2019-08-07T21:31:19.529Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0" version="11.1.1" etag="UwVkghIrS_3It0wLXrjA" type="device" compressed="false"> - <diagram id="gin4T65YKoAZ5fak4WjD"> +<mxfile modified="2019-08-08T15:16:46.006Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0" version="11.1.1" etag="H96Zn0rmH9QJZIlKTs0W" type="device" compressed="false"> + <diagram id="UR5ajb4HnDohR5UMhgep"> <mxGraphModel dx="2205" dy="778" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0"> <root> <mxCell id="0"/> @@ -20,52 +20,52 @@ <mxCell id="6" value="satisfies 8 hours" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> <mxGeometry x="192" y="2631" width="123" height="40" as="geometry"/> </mxCell> - <mxCell id="7" value="" style="endArrow=none;dashed=1;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" source="5" target="6" parent="1"> - <mxGeometry width="50" height="50" relative="1" as="geometry"> - <mxPoint x="755.5" y="2561" as="sourcePoint"/> - <mxPoint x="805.5" y="2511" as="targetPoint"/> - </mxGeometry> - </mxCell> - <mxCell id="8" value="commitment to work 8 hours machining" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxCell id="7" value="commitment to work 8 hours machining" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> <mxGeometry x="354" y="2631" width="137" height="40" as="geometry"/> </mxCell> - <mxCell id="9" value="" style="endArrow=none;dashed=1;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" source="6" target="8" parent="1"> - <mxGeometry width="50" height="50" relative="1" as="geometry"> - <mxPoint x="550" y="2740" as="sourcePoint"/> - <mxPoint x="600" y="2690" as="targetPoint"/> - </mxGeometry> + <mxCell id="8" value="fulfills 4 hours" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxGeometry x="357" y="2705" width="83" height="40" as="geometry"/> + </mxCell> + <mxCell id="9" value="work 4 hours machining" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxGeometry x="467.5" y="2770" width="106" height="40" as="geometry"/> </mxCell> <mxCell id="10" value="fulfills 4 hours" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> - <mxGeometry x="357" y="2705" width="83" height="40" as="geometry"/> + <mxGeometry x="479" y="2705" width="83" height="40" as="geometry"/> </mxCell> - <mxCell id="11" value="" style="endArrow=none;dashed=1;html=1;entryX=0.25;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" source="10" target="8" parent="1"> + <mxCell id="11" value="" style="endArrow=classic;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" source="6" target="5" parent="1"> <mxGeometry width="50" height="50" relative="1" as="geometry"> - <mxPoint x="340" y="2840" as="sourcePoint"/> - <mxPoint x="390" y="2790" as="targetPoint"/> + <mxPoint x="120" y="2790" as="sourcePoint"/> + <mxPoint x="170" y="2740" as="targetPoint"/> </mxGeometry> </mxCell> - <mxCell id="12" value="" style="endArrow=none;dashed=1;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" source="10" target="4" parent="1"> + <mxCell id="12" value="" style="endArrow=classic;html=1;exitX=0;exitY=0.5;exitDx=0;exitDy=0;entryX=1;entryY=0.5;entryDx=0;entryDy=0;" edge="1" source="7" target="6" parent="1"> <mxGeometry width="50" height="50" relative="1" as="geometry"> - <mxPoint x="490" y="2840" as="sourcePoint"/> - <mxPoint x="540" y="2790" as="targetPoint"/> + <mxPoint x="160" y="2790" as="sourcePoint"/> + <mxPoint x="210" y="2740" as="targetPoint"/> </mxGeometry> </mxCell> - <mxCell id="13" value="work 4 hours machining" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> - <mxGeometry x="467.5" y="2770" width="106" height="40" as="geometry"/> + <mxCell id="13" value="" style="endArrow=classic;html=1;entryX=0.25;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" source="8" target="7" parent="1"> + <mxGeometry width="50" height="50" relative="1" as="geometry"> + <mxPoint x="240" y="2790" as="sourcePoint"/> + <mxPoint x="290" y="2740" as="targetPoint"/> + </mxGeometry> </mxCell> - <mxCell id="14" value="fulfills 4 hours" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> - <mxGeometry x="479" y="2705" width="83" height="40" as="geometry"/> + <mxCell id="14" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.75;entryY=1;entryDx=0;entryDy=0;" edge="1" source="10" target="7" parent="1"> + <mxGeometry width="50" height="50" relative="1" as="geometry"> + <mxPoint x="180" y="2800" as="sourcePoint"/> + <mxPoint x="230" y="2750" as="targetPoint"/> + </mxGeometry> </mxCell> - <mxCell id="15" value="" style="endArrow=none;dashed=1;html=1;exitX=0.5;exitY=1;exitDx=0;exitDy=0;entryX=0.5;entryY=0;entryDx=0;entryDy=0;" edge="1" source="14" target="13" parent="1"> + <mxCell id="15" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" source="4" target="8" parent="1"> <mxGeometry width="50" height="50" relative="1" as="geometry"> - <mxPoint x="612" y="2840" as="sourcePoint"/> - <mxPoint x="662" y="2790" as="targetPoint"/> + <mxPoint x="280" y="2750" as="sourcePoint"/> + <mxPoint x="330" y="2700" as="targetPoint"/> </mxGeometry> </mxCell> - <mxCell id="16" value="" style="endArrow=none;dashed=1;html=1;entryX=0.75;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" source="14" target="8" parent="1"> + <mxCell id="16" value="" style="endArrow=classic;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.5;entryY=1;entryDx=0;entryDy=0;" edge="1" source="9" target="10" parent="1"> <mxGeometry width="50" height="50" relative="1" as="geometry"> - <mxPoint x="620" y="2730" as="sourcePoint"/> - <mxPoint x="670" y="2680" as="targetPoint"/> + <mxPoint x="200" y="2810" as="sourcePoint"/> + <mxPoint x="250" y="2760" as="targetPoint"/> </mxGeometry> </mxCell> </root> diff --git a/release-doc-in-process/prop-barter.png b/release-doc-in-process/prop-barter.png Binary files differ. diff --git a/release-doc-in-process/prop-barter.xml b/release-doc-in-process/prop-barter.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<mxfile modified="2019-08-08T10:52:39.203Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0" version="11.1.1" etag="SnMxkkn2Z9NYSC3StHAF" type="device" compressed="false"> - <diagram id="MtOMCM2SMihHkVvPCbir"> +<mxfile modified="2019-08-08T15:28:50.657Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0" version="11.1.1" etag="PMmz6RQPj82MBeJXp-6j" type="device" compressed="false"> + <diagram id="wZCKOC4BCC0VBZ7lWbB4"> <mxGraphModel dx="2205" dy="778" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0"> <root> <mxCell id="0"/> @@ -11,7 +11,7 @@ <mxCell id="3" value="Proposal: cider barter" style="shape=hexagon;perimeter=hexagonPerimeter2;whiteSpace=wrap;html=1;" vertex="1" parent="1"> <mxGeometry x="114" y="3191" width="125" height="40" as="geometry"/> </mxCell> - <mxCell id="4" value="intent to provide transfer 3 gallons apple cider" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxCell id="4" value="intent to provide 3 gallons apple cider" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> <mxGeometry x="191" y="3250" width="130" height="40" as="geometry"/> </mxCell> <mxCell id="5" value="<div>intent to receive use of a cider press<br></div>&nbsp;6 hours" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> diff --git a/release-doc-in-process/prop-list.png b/release-doc-in-process/prop-list.png Binary files differ. diff --git a/release-doc-in-process/prop-list.xml b/release-doc-in-process/prop-list.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<mxfile modified="2019-08-08T10:54:27.612Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0" version="11.1.1" etag="jucAvYyi81Wv5Q9uNh0q" type="device" compressed="false"> - <diagram id="yvO_iJNMdXf9WIjNAZIK"> +<mxfile modified="2019-08-08T15:31:27.378Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0" version="11.1.1" etag="rkBW0LSuDt24I535eQL0" type="device" compressed="false"> + <diagram id="EdAMWooHoyToYXzOGRlz"> <mxGraphModel dx="2205" dy="778" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0"> <root> <mxCell id="0"/> @@ -11,10 +11,10 @@ <mxCell id="3" value="Proposal: carrots" style="shape=hexagon;perimeter=hexagonPerimeter2;whiteSpace=wrap;html=1;" vertex="1" parent="1"> <mxGeometry x="117" y="3511" width="125" height="40" as="geometry"/> </mxCell> - <mxCell id="4" value="intent to receive transfer $18" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxCell id="4" value="intent to receive $18" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> <mxGeometry x="193.5" y="3569.5" width="123" height="40" as="geometry"/> </mxCell> - <mxCell id="5" value="<div>intent to provide transfer</div><div>carrots 25# case<br></div>" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxCell id="5" value="<div>intent to provide <br></div><div>carrots 25# case<br></div>" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> <mxGeometry x="40" y="3570" width="130" height="40" as="geometry"/> </mxCell> <mxCell id="6" value="" style="endArrow=none;dashed=1;html=1;entryX=0;entryY=0.75;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" source="5" target="3" parent="1"> @@ -32,10 +32,10 @@ <mxCell id="8" value="Proposal: beets" style="shape=hexagon;perimeter=hexagonPerimeter2;whiteSpace=wrap;html=1;" vertex="1" parent="1"> <mxGeometry x="407.5" y="3510.5" width="125" height="40" as="geometry"/> </mxCell> - <mxCell id="9" value="intent to receive transfer $32" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxCell id="9" value="intent to receive $32" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> <mxGeometry x="484" y="3569" width="123" height="40" as="geometry"/> </mxCell> - <mxCell id="10" value="<div>intent to provide transfer</div><div>beets 25# case<br></div>" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxCell id="10" value="<div>intent to provide <br></div><div>beets 25# case<br></div>" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> <mxGeometry x="330.5" y="3569.5" width="130" height="40" as="geometry"/> </mxCell> <mxCell id="11" value="" style="endArrow=none;dashed=1;html=1;entryX=0;entryY=0.75;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" source="10" target="8" parent="1"> diff --git a/release-doc-in-process/prop-sell-give.png b/release-doc-in-process/prop-sell-give.png Binary files differ. diff --git a/release-doc-in-process/prop-sell-give.xml b/release-doc-in-process/prop-sell-give.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<mxfile modified="2019-08-08T10:51:03.923Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0" version="11.1.1" etag="lnLq9lAcpfAHLoEPOK1o" type="device" compressed="false"> - <diagram id="P8RD2GcbzgtbeMPvjaA1"> +<mxfile modified="2019-08-08T15:27:20.719Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0" version="11.1.1" etag="6xS8MH0q31AvpF_hFPVj" type="device" compressed="false"> + <diagram id="iybcfZLBgwr2JvnA-9yM"> <mxGraphModel dx="2205" dy="778" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0"> <root> <mxCell id="0"/> @@ -11,10 +11,10 @@ <mxCell id="3" value="Proposal: offer a used bike" style="shape=hexagon;perimeter=hexagonPerimeter2;whiteSpace=wrap;html=1;" vertex="1" parent="1"> <mxGeometry x="107" y="2874" width="125" height="40" as="geometry"/> </mxCell> - <mxCell id="4" value="intent to receive transfer $15" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxCell id="4" value="intent to receive&nbsp; $15" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> <mxGeometry x="183.5" y="2932.5" width="123" height="40" as="geometry"/> </mxCell> - <mxCell id="5" value="<div>intent to provide transfer</div><div> 1 used bicycle</div>" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxCell id="5" value="<div>intent to provide <br></div><div> 1 used bicycle</div>" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> <mxGeometry x="30" y="2932.5" width="123" height="40" as="geometry"/> </mxCell> <mxCell id="6" value="" style="endArrow=none;dashed=1;html=1;entryX=0;entryY=0.75;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" source="5" target="3" parent="1"> @@ -35,7 +35,7 @@ <mxCell id="9" value="<div>Proposal: free</div><div> used bike</div>" style="shape=hexagon;perimeter=hexagonPerimeter2;whiteSpace=wrap;html=1;" vertex="1" parent="1"> <mxGeometry x="362" y="2875" width="125" height="40" as="geometry"/> </mxCell> - <mxCell id="10" value="<div>intent to provide transfer</div><div> 1 used bicycle</div>" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxCell id="10" value="<div>intent to provide <br></div><div> 1 used bicycle</div>" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> <mxGeometry x="363.5" y="2932.5" width="123" height="40" as="geometry"/> </mxCell> <mxCell id="11" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" source="10" target="9" parent="1"> diff --git a/release-doc-in-process/prop-timebank.xml b/release-doc-in-process/prop-timebank.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<mxfile modified="2019-08-08T10:51:55.711Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0" version="11.1.1" etag="AhV5EqW_eNJnIEe59C4f" type="device" compressed="false"> - <diagram id="AoMcYMcC3ITQFCDnM5ae"> +<mxfile modified="2019-08-08T15:28:05.182Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0" version="11.1.1" etag="RvVjvmeU2BibOPINaLtp" type="device" compressed="false"> + <diagram id="KRpLj5iR-qM5Ng0ASiMs"> <mxGraphModel dx="2205" dy="778" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0"> <root> <mxCell id="0"/> diff --git a/release-doc-in-process/prop-work.png b/release-doc-in-process/prop-work.png Binary files differ. diff --git a/release-doc-in-process/prop-work.xml b/release-doc-in-process/prop-work.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<mxfile modified="2019-08-08T10:53:29.637Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0" version="11.1.1" etag="HV94sdaylqa12tfEunaQ" type="device" compressed="false"> - <diagram id="Oxt0U3jliRczE0Clk8xV"> +<mxfile modified="2019-08-08T15:37:44.561Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0" version="11.1.1" etag="oZo9TKiZZNfmzc-VbUvQ" type="device" compressed="false"> + <diagram id="_2jRwXymetFBOvMG9JFj"> <mxGraphModel dx="2205" dy="778" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0"> <root> <mxCell id="0"/> @@ -9,9 +9,9 @@ <mxGeometry x="29" y="3340" width="631" height="120" as="geometry"/> </mxCell> <mxCell id="3" value="Proposal:request for work" style="shape=hexagon;perimeter=hexagonPerimeter2;whiteSpace=wrap;html=1;" vertex="1" parent="1"> - <mxGeometry x="277.5" y="3351" width="125" height="40" as="geometry"/> + <mxGeometry x="294.5" y="3351" width="125" height="40" as="geometry"/> </mxCell> - <mxCell id="4" value="intent to provide transfer of US dollars" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxCell id="4" value="intent to provide US dollars" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> <mxGeometry x="366" y="3409" width="144" height="40" as="geometry"/> </mxCell> <mxCell id="5" value="" style="endArrow=none;dashed=1;html=1;entryX=0;entryY=0.75;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" source="8" target="3" parent="1"> @@ -29,8 +29,8 @@ <mxCell id="7" value="Develop soil moisture sensor" style="ellipse;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> <mxGeometry x="47" y="3402" width="104" height="50" as="geometry"/> </mxCell> - <mxCell id="8" value="intent to work 16 hours electrochemical engineer" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> - <mxGeometry x="177" y="3406" width="143" height="43" as="geometry"/> + <mxCell id="8" value="intent to find someone to work 16 hours electrochemical engineer" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxGeometry x="177" y="3406" width="173" height="43" as="geometry"/> </mxCell> <mxCell id="9" value="" style="endArrow=classic;html=1;entryX=1;entryY=0.5;entryDx=0;entryDy=0;exitX=0;exitY=0.5;exitDx=0;exitDy=0;" edge="1" source="8" target="7" parent="1"> <mxGeometry width="50" height="50" relative="1" as="geometry"> diff --git a/release-doc-in-process/resource-spec.png b/release-doc-in-process/resource-spec.png Binary files differ. diff --git a/release-doc-in-process/resource-spec.xml b/release-doc-in-process/resource-spec.xml @@ -1,27 +1,27 @@ <?xml version="1.0" encoding="UTF-8"?> -<mxfile modified="2019-08-08T13:39:50.876Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0" version="11.1.1" etag="hf0Xp0JHvVmkYwFrBZIG" type="device" compressed="false"> - <diagram id="UvWvX6AO7f6RzM_ZGURe"> +<mxfile modified="2019-08-08T15:03:17.000Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0" version="11.1.1" etag="WJV4t217RzU6ZXiDkjg6" type="device" compressed="false"> + <diagram id="_EGYIXRopUPKuICLPCbo"> <mxGraphModel dx="2205" dy="778" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0"> <root> <mxCell id="0"/> <mxCell id="1" parent="0"/> <mxCell id="2" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fff2cc;strokeColor=none;align=left;verticalAlign=top;" vertex="1" parent="1"> - <mxGeometry x="29" y="4540" width="411" height="67" as="geometry"/> + <mxGeometry x="29" y="4540" width="511" height="67" as="geometry"/> </mxCell> <mxCell id="3" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#d5e8d4;strokeColor=none;align=left;verticalAlign=bottom;" vertex="1" parent="1"> - <mxGeometry x="29" y="4607" width="411" height="83" as="geometry"/> + <mxGeometry x="29" y="4607" width="511" height="83" as="geometry"/> </mxCell> <mxCell id="4" value="<div>LifeTrac<br></div><div>specification<br></div>" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1"> - <mxGeometry x="44" y="4555" width="100" height="40" as="geometry"/> + <mxGeometry x="45" y="4555" width="100" height="40" as="geometry"/> </mxCell> <mxCell id="5" value="loose organic carrots 650 kg" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1"> <mxGeometry x="173" y="4630" width="103" height="40" as="geometry"/> </mxCell> <mxCell id="6" value="<div>LifeTrac tractor<br></div>" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1"> - <mxGeometry x="49" y="4630" width="90" height="40" as="geometry"/> + <mxGeometry x="50" y="4630" width="90" height="40" as="geometry"/> </mxCell> <mxCell id="7" value="intern orientation instructions" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1"> - <mxGeometry x="306" y="4630" width="114" height="40" as="geometry"/> + <mxGeometry x="413.5" y="4630" width="114" height="40" as="geometry"/> </mxCell> <mxCell id="8" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" source="6" target="4" parent="1"> <mxGeometry width="50" height="50" relative="1" as="geometry"> @@ -29,6 +29,33 @@ <mxPoint x="417" y="4600" as="targetPoint"/> </mxGeometry> </mxCell> + <mxCell id="9" value="Carrots organic" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1"> + <mxGeometry x="175" y="4558" width="100" height="40" as="geometry"/> + </mxCell> + <mxCell id="10" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" source="5" target="9" parent="1"> + <mxGeometry width="50" height="50" relative="1" as="geometry"> + <mxPoint x="104" y="4640" as="sourcePoint"/> + <mxPoint x="427" y="4610" as="targetPoint"/> + </mxGeometry> + </mxCell> + <mxCell id="11" value="Farm document" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1"> + <mxGeometry x="424" y="4558" width="93" height="40" as="geometry"/> + </mxCell> + <mxCell id="12" value="" style="endArrow=none;dashed=1;html=1;entryX=0.5;entryY=1;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" source="7" target="11" parent="1"> + <mxGeometry width="50" height="50" relative="1" as="geometry"> + <mxPoint x="474" y="4632.5" as="sourcePoint"/> + <mxPoint x="797" y="4602.5" as="targetPoint"/> + </mxGeometry> + </mxCell> + <mxCell id="13" value="lot 3409888" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1"> + <mxGeometry x="296" y="4630" width="90" height="40" as="geometry"/> + </mxCell> + <mxCell id="14" value="" style="endArrow=none;html=1;entryX=0;entryY=0.5;entryDx=0;entryDy=0;exitX=1;exitY=0.5;exitDx=0;exitDy=0;" edge="1" source="5" target="13" parent="1"> + <mxGeometry width="50" height="50" relative="1" as="geometry"> + <mxPoint x="210" y="4810" as="sourcePoint"/> + <mxPoint x="260" y="4760" as="targetPoint"/> + </mxGeometry> + </mxCell> </root> </mxGraphModel> </diagram> diff --git a/release-doc-in-process/transport-transfer.png b/release-doc-in-process/transport-transfer.png Binary files differ. diff --git a/release-doc-in-process/transport-transfer.xml b/release-doc-in-process/transport-transfer.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> -<mxfile modified="2019-08-08T12:19:07.239Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0" version="11.1.1" etag="dxFxGoEpXFzokyGeznLk" type="device" compressed="false"> - <diagram id="ySRBvQvr_8nwf4P8XMXW"> +<mxfile modified="2019-08-08T15:46:06.755Z" host="www.draw.io" agent="Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:68.0) Gecko/20100101 Firefox/68.0" version="11.1.1" etag="LGMQlCEzchTZCFKEAEUm" type="device" compressed="false"> + <diagram id="mfRQpddUL4VJJqIOGON4"> <mxGraphModel dx="2205" dy="778" grid="1" gridSize="10" guides="1" tooltips="1" connect="1" arrows="1" fold="1" page="1" pageScale="1" pageWidth="850" pageHeight="1100" math="0" shadow="0"> <root> <mxCell id="0"/> @@ -32,16 +32,16 @@ <mxCell id="8" value="" style="rounded=0;whiteSpace=wrap;html=1;fillColor=#fad9d5;strokeColor=none;align=left;verticalAlign=top;" vertex="1" parent="1"> <mxGeometry x="31" y="3730" width="939" height="120" as="geometry"/> </mxCell> - <mxCell id="9" value="commitment to transfer 30kg apples to Bob" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> - <mxGeometry x="50" y="3750" width="132" height="40" as="geometry"/> + <mxCell id="9" value="commitment to transfer 30kg apples from Alice to Bob" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxGeometry x="47" y="3750" width="133" height="40" as="geometry"/> </mxCell> <mxCell id="10" value="Transportation agreement" style="shape=hexagon;perimeter=hexagonPerimeter2;whiteSpace=wrap;html=1;" vertex="1" parent="1"> <mxGeometry x="687" y="3740.5" width="125" height="40" as="geometry"/> </mxCell> - <mxCell id="11" value="commitment to transfer $10 to Claudia" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> - <mxGeometry x="804" y="3800" width="123" height="40" as="geometry"/> + <mxCell id="11" value="commitment to transfer $10 from Alice to Claudia" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxGeometry x="808" y="3800" width="123" height="40" as="geometry"/> </mxCell> - <mxCell id="12" value="commitment to Alice for transportation service" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxCell id="12" value="commitment from Claudia to Alice for transportation service" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> <mxGeometry x="544" y="3800" width="153" height="40" as="geometry"/> </mxCell> <mxCell id="13" value="" style="endArrow=none;dashed=1;html=1;entryX=0;entryY=0.75;entryDx=0;entryDy=0;exitX=0.5;exitY=0;exitDx=0;exitDy=0;" edge="1" source="12" target="10" parent="1"> @@ -56,8 +56,8 @@ <mxPoint x="926" y="3776.5" as="targetPoint"/> </mxGeometry> </mxCell> - <mxCell id="15" value="transfer 30kg of apples to Claudia" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> - <mxGeometry x="197" y="3866" width="114" height="40" as="geometry"/> + <mxCell id="15" value="transfer possession from Alice to Claudia 30kg apples" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxGeometry x="197" y="3866" width="143" height="40" as="geometry"/> </mxCell> <mxCell id="16" value="Apples 30kg" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1"> <mxGeometry x="82" y="3866" width="90" height="40" as="geometry"/> @@ -69,7 +69,7 @@ </mxGeometry> </mxCell> <mxCell id="18" value="Apples 30kg" style="rounded=0;whiteSpace=wrap;html=1;" vertex="1" parent="1"> - <mxGeometry x="327.5" y="3864.5" width="90" height="40" as="geometry"/> + <mxGeometry x="360" y="3864.5" width="90" height="40" as="geometry"/> </mxCell> <mxCell id="19" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" source="15" target="18" parent="1"> <mxGeometry width="50" height="50" relative="1" as="geometry"> @@ -137,7 +137,7 @@ <mxPoint x="313.5" y="4109.5" as="targetPoint"/> </mxGeometry> </mxCell> - <mxCell id="33" value="transfer Bob receives 30kg apples" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxCell id="33" value="transfer possession from Claudia to Bob 30kg apples" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> <mxGeometry x="636.5" y="4044" width="137" height="40" as="geometry"/> </mxCell> <mxCell id="34" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" source="29" target="33" parent="1"> @@ -152,7 +152,7 @@ <mxPoint x="370" y="4160" as="targetPoint"/> </mxGeometry> </mxCell> - <mxCell id="36" value="transfer 30kg apples to Bob" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxCell id="36" value="transfer 30kg apples from Alice to Bob" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> <mxGeometry x="790.5" y="4043.5" width="97" height="40" as="geometry"/> </mxCell> <mxCell id="37" value="" style="endArrow=classic;html=1;exitX=1;exitY=0.5;exitDx=0;exitDy=0;entryX=0;entryY=0.5;entryDx=0;entryDy=0;" edge="1" source="33" target="36" parent="1"> @@ -171,7 +171,7 @@ </Array> </mxGeometry> </mxCell> - <mxCell id="39" value="transfer $10 to Claudia" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> + <mxCell id="39" value="transfer $10 from Alice to Claudia" style="shape=delay;whiteSpace=wrap;html=1;rounded=0;glass=1;comic=0;" vertex="1" parent="1"> <mxGeometry x="850" y="4120" width="102" height="40" as="geometry"/> </mxCell> <mxCell id="40" value="" style="endArrow=none;dashed=1;html=1;exitX=0.5;exitY=0;exitDx=0;exitDy=0;entryX=0.75;entryY=1;entryDx=0;entryDy=0;" edge="1" source="39" target="11" parent="1">
