valueflows

valueflows docs
git clone https://s.sonu.ch/~srfsh/valueflows.git
Log | Files | Refs | README

commit 1295e8659cde90aedd5c889103e5932825ce8deb
parent 13bfe34fc52809ec62cacbac23bb8cc2a08a32a8
Author: Bob Haugen <bob.haugen@gmail.com>
Date:   Sat, 18 Jul 2020 21:17:14 +0000

Merge branch 'unit' into 'master'

document Unit better

See merge request valueflows/valueflows!643
Diffstat:
Mdocs/introduction/flows.md | 1+
Mdocs/specification/external-terms.md | 3++-
Mrelease-doc-in-process/ValueFlowsUML.png | 0
Mrelease-doc-in-process/ValueFlowsUML.xml | 4++--
4 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/docs/introduction/flows.md b/docs/introduction/flows.md @@ -113,3 +113,4 @@ Sometimes a quantity is expressed in time-based units, like "I worked 6 hours", Sometimes a situation may call for a "compound quantity", like "Number-per-Year". +Display note: The OM2 ontology defines a Unit called `one` that is used for one-dimensional units. This is confusing for many economic applications, where something like `each` would be used, or nothing at all. We recommend that user interfaces handle this by not displaying the unit `one` where it would be confusing, or substituting a more applicable name. diff --git a/docs/specification/external-terms.md b/docs/specification/external-terms.md @@ -32,7 +32,8 @@ http://www.ontology-of-units-of-measure.org/resource/om-2/ * [`om2:Unit`](http://www.ontology-of-units-of-measure.org/resource/om-2/Unit) * A list of units can also be found here. Each subclass on this page has an additional list of units. - * VF will use (at least) rdfs:label and om:symbol as properties of Units. + * VF will use (at least) `rdfs:label` and `om2:symbol` as properties of Units. + * See note at the end of [Flows](https://valueflo.ws/introduction/flows.html) regarding display of unit `om2:one`. ### DTYPE diff --git a/release-doc-in-process/ValueFlowsUML.png b/release-doc-in-process/ValueFlowsUML.png Binary files differ. diff --git a/release-doc-in-process/ValueFlowsUML.xml b/release-doc-in-process/ValueFlowsUML.xml @@ -1 +1 @@ -<mxfile modified="2020-05-31T19:46:12.978Z" host="www.draw.io" agent="5.0 (X11)" etag="-M4tAk-pUXa6V3X5-Aws" version="13.1.3" type="device"><diagram id="fbe6a5e9-5b10-23b0-562a-0cf294ecc85a" name="Page-1">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</diagram></mxfile>- \ No newline at end of file +<mxfile modified="2020-07-18T18:47:10.828Z" host="app.diagrams.net" agent="5.0 (X11)" etag="Ikc4f2MwIxUnNWq6gFFU" version="13.4.4" type="device"><diagram id="fbe6a5e9-5b10-23b0-562a-0cf294ecc85a" name="Page-1">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</diagram></mxfile>+ \ No newline at end of file