Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Additional air handling unit types #274

Merged
merged 2 commits into from
Jun 10, 2021
Merged

Additional air handling unit types #274

merged 2 commits into from
Jun 10, 2021

Conversation

carlosduarteroa
Copy link
Contributor

No description provided.

gtfierro
gtfierro reviewed May 14, 2021
View reviewed changes
bricksrc/equipment.py Outdated
@@ -439,6 +439,28 @@
"AHU": {
"tags": [TAG.Equipment, TAG.AHU],
"subclasses": {
"Dedicated_Outdoor_Air_System": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What do you think about using Dedicated_Outdoor_Air_System_Unit so that it is clear from looking at the term that this is an Equipment and not a System?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, I agree with your suggestion to make it clearer.

bricksrc/equipment.py
],
OWL.equivalentClass: BRICK["DOAS"],
},
"DOAS": {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This could still be DOAS if that's a common abbreviation

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, that is the common abbreviation.

@gtfierro
Copy link
Member

gtfierro commented Jun 8, 2021

@carlosduarteroa when you get a chance can you make the above changes, or let me know if you'd like me to handle them?

@carlosduarteroa
Copy link
Contributor Author

Thanks for reviewing. I made the changes.

@gtfierro
Copy link
Member

Thanks @carlosduarteroa!

@gtfierro gtfierro merged commit c1f45ee into BrickSchema:master Jun 10, 2021
gtfierro added a commit that referenced this pull request Nov 2, 2021
@gtfierro @jbkoh
@carlosduarteroa @wcrd @david-waterworth @jbulow-se @jbulow
SHACL-based Brick Implementation (#341)
30a7ac0 
* adding documentation on Brick releases (#264)

* Class-based shapes (#240)

* init class shapes

* Fix Nightly Builds (#241)

* try renaming file

* trying a different release package

* Amending QUDT Definitions (#239)

* change owl:sameAs to brick:hasQUDTReference

* fix Grains -> GrainsOfMoisture

* update QUDT

* simplify generation code

* fix test to reflect new implementation

* include units, even those without a symbol

* do not make Brick Quantities also QUDT Quantity Kinds

* fixing Dimensionless reference, correcting sameAs for power

* fix typos, remove undefined QUDT units

* follow steves recommendation for ontology metadata

* updating uris

* Update Ontology Metadata (#245)

* update ontology metadata to include publisher, issued, modified and use owl.versionInfo rather than dcterms.version (which does not exist)

* make publisher a blank node

* use date of publication as release date

* remove old logic for shacl test

* amend definition for isPointOf (#251)

* Adding quantities, sensor classes for air quality (#247)

* adding quantities, sensor classes for air quality

* add air quality example file + graph

* fix CO2 tags now that it is outside of particulate matter

* add definitions

* use brick value, not brick area inside the entity property (#254)

* Regenerate air quality sensor example (#255)

* use brick value, not brick area inside the entity property

* regenerate file

* fix typo

* implement disjoint classes & add tests

* clean up code

* init class shapes

* remove old logic for shacl test

* fix typo

* implement disjoint classes & add tests

* clean up code

* update shacl

* add shacl messages

* use brickschema

Co-authored-by: Gabe Fierro <[email protected]>

* generalizing solar panel and adding its subclasses (#248)

* generalizing solar panel and adding its subclasses based on the discussion at https://groups.google.com/u/1/g/brickschema/c/hvverLxC16A/m/NlvGEvcJBgAJ

* remove Solar_Panel

* add building electrical meter example (#265)

* Fixing Meter relationship in example (#266)

* add building electrical meter example

* fix relationship for meter

* add types to external properties and classes (#267)

* Fixing ASHRAE reference (#268)

* ASHRAE URI is not real; amend to something that does not break downstream parsing

* update reference

* Fix the rest of the rdfs:seeAlso URI encoding (#275)

* fix the rest of the rdfs:seeAlso URI encoding

* add seealso encoding test

* fix test to not require URIs as the only kind of resource for definitions

* added open close status classes

* Added Water Level Alarms (#282)

* added water level alarms

* fixed issue with comma in definition

* Added Lockout and Availability Status Points (#280)

* added lockout and availability status classes

* fixed issue with using comma within definitions

* added flow sensors points (#279)

* Added New Boiler Types (#283)

* added new boiler types

* Fixed capitalization in TAG term.

Co-authored-by: Gabe Fierro <[email protected]>

* Additional air handling unit types (#274)

* added classes for more air handling unit types

* added Unit suffix to DOAS name

* Update pre-commit configuration (#286)

* bumping versions, updating precommit config

* wrong version for pre-commit

* added air system classes (#278)

Co-authored-by: Gabe Fierro <[email protected]>

* fix bad merge: remove exhaust air system (#288)

* remove equipment-flavored open-close status points

* Radiant system terminal unit classes (#270)

* added radiant system termianl unit classes

* removed non uri from see also columns

* added missing rcp class

* added Panel suffix to radiant terminal unit equip names

* Add Shapes to Brick distribution (#285)

* add comments to the shapes

* add shacl shapes to base Brick distribution

* fix typo

* building Brick is dependent on shacl shapes now

* fixup shacl shapes

* update generated shapes

* PV Systems and Entity Properties (#273)

* add entity properties for panels

* add generated solar array example

* add azimuth angle in favor of orientation

* add azimuth angle to entity properties

* add meter to solar panel example

* add rated/measured power output

* add geocoordinates, efficiency

* rated vs measured conversion efficiency

* add export annotation on poitns

* more entity properties in the example

* fix header

* maximum -> nominal

* update more entity properties

* update shapes

* update examples

* Updating Nightly Builds (#289)

* explicitly pull allegrograph container in build;regen shacl before Brick

* try newer container

* try beta brickschema w/ more logging

* bump deps

* bump deps

* update deps

* update deps

* update deps

* update deps

* update deps

* update deps

* update deps

* update deps

* update deps

* use "/" suffix for sosa namespace (#295)

* add imbalance sensors (#293)

* add stage riser; update riser defn (#296)

* value of path should be sh:class, not rdfs:range (#300)

* Add testing for examples (#299)

* add labels to units when we import them into Brick

* make sure QUDT units are encoded as such

* fixing up shapes, examples

* add example tests

* fixing up example1

* Add UFAD and diffuser equipment and points (#297)

* added ufad equipment and diffuser classes

* added ufad sensor and setpoint classes

* Fixing validation of entity properties (#301)

* working on fixing validation of entity properties

* working on tests

* add types to entity property enumerations; fix entity property test to include types

* keep as byte encoding until brickschema version bump

* fix shacl generation

* fix units in air quality example

* decimal value for shapes

* fixing shape definitions, updating encodings

* add optional stuff to shapes

* more edits

* ditch Py3.6

* bump deps

* validate entity properties

* remove reference to defunct tags.py file (#303)

* Add collection types (#269)

* working on modeling collections

* fix typo

* add PV array

* fix class name in definition

* add air loop

* add constraints to collections

* add collection inference rules

* add unit test for collection

* adding some definitions

* remove rule stuff

* move PV array to collections

* remove Make predicate

* ensure systems can be in systems; ensure collections can contain locations

* add PV array to possible contents of systems

* Adding Differential Quantities to Brick (#294)

* try differential static pressure

* working on more differential quantities, adding annotations to sensors

* fix annotation

* fix some quantities

* fix inference related to differential sensors

* fix co2 sensor query test

* V1.2.1 release (#309)

* added radiant system temperature sensor classes

* added radiant system temperature setpoints

* deleted property from embedded temp sensor

* starting v1.2.1 release

* branch stuff

* added diff temp points and water temp setpoints (#277)

Co-authored-by: Gabe Fierro <[email protected]>

* Added Differential Pressure Points (#276)

* added and restructured diff pressure points

* added a more specific tag for diff pressure to resolve over infer

Co-authored-by: Gabe Fierro <[email protected]>

* use more generic differential pressure quantity for sensors

* more stuff

* working on versions, directions

* fix transmittence typo

* make sure we do not add duplicate RDFS labels (#307)

* remove controls (#310)

* Allow Entity Properties to have generic numeric values (#311)

* add list to help entity properties have generic numeric values

* minor refactor

* update shacl tag test

* adjusting implementation of radiant temp sensors

* fix misplaced tags

* load local extenstion files

* Expand ApplicableUnits annotations (#306)

* update QUDT, use skos:broader hierarchy traversals

* switch to CelsiusTemperature

* try out Temperature

* use narrower, not broader

* traverse up, not down the skos hierarchy

* removing skos:narrower traversal

* derive units from the quantity

Co-authored-by: Gabe Fierro <[email protected]>

* fix bad merge

* first draft of release notes

Co-authored-by: Carlos Duarte <[email protected]>
Co-authored-by: Gabe Fierro <[email protected]>
Co-authored-by: Jason B. Koh <[email protected]>

* - Add Chilled Beam and subclasses (#302)

- Add Induction Unit

* removing intersection classes

* Fix RDFS Labels (#313)

* get the truth value correct when checking for rdfs labels

* more tests; ensure not adding duplicate labels

* Added brick:Relief_Damper, brick:Relief_Fan and tag:Relief (#312)

Co-authored-by: David Waterworth <[email protected]>

* System shape

* Remove redundant shape definition

* before rebase

* Changed to Collection

* Replaced remaining use of System with Collection

* fix construction of shacl rules

* Adding optimized SHACL shapes to reduce inference time (#316)

* adding optimized SHACL shapes to reduce reasoning time

* extra shacl step

* bump requirements

* bump brickschema to enable new pyshacl

* fix slow mark? try different inference schedule

* ensure tiem imported for now

* compress to shorter schedule

* fix measure inference

* fix hierarchy inference

* Reduce automated test time (#320)

* mark hierarchy inference test as slow

* use xdist for tests

* bump brickschema to proper version for testing

* bump brickschema again

* avoid "slow" tests and use worker threads in github build action

* Add Sensors from NREL Example Models (#317)

* add some missing sensors

* add coils, etc to the PR

* brick reasoning shortcut schedule

* fix measures annotation

* fix measures annotation

* run "slow" tests too

* Labels on properties and entity properties (#322)

* Some labels on relations

* Labels on entity properties

* Labels on properties

* Remove duplicate

Co-authored-by: Jonas Bülow <[email protected]>

* Fix spelling (#323)

* Ignore generated files (#327)

* Ignore generated files

* Updates from review comments

Co-authored-by: Jonas Bülow <[email protected]>

* fix Dew_Point to Dewpoint (#338)

* add misc concepts (#335)

* restructure valve hierarchy and add TMV (#333)

* restructure valve hierarchy by introducing hvac valve and adding a non-hvac valve

* fix loops

* remote incorrect tags (#340)

* add miscellaneous alarms (#331)

* more alarms

* add defs

* missing declaration

* add missing points (#329)

* add missing points

* remove Air_Humidity_Setpoint

* add def

* fix typo

Co-authored-by: Gabe Fierro <[email protected]>

* using shacl inf, not owl; switch to Brick.Entity as root class

* ensure pyshacl version

* add rules.ttl for shacl

* add CRAH (#342)

* Update files generated from source (#326)

* Update files generated from source

* Avoid repo diff after running tests

Co-authored-by: Jonas Bülow <[email protected]>

* more shacl features

* Added heating, cooling enable commands (#339)

* added heating, cooling enable commands

* updated heating/cooling enable command definitions

* Remove second skos:definition for Brick#Building (#343)

* fix entity property range

* add draft of tag rule (not that we want to do this) ; fix setpoint test

* try double-shacl, use subclassof

* bump reqs

* Update rules.ttl

* triple shacl

Co-authored-by: Jason B. Koh <[email protected]>
Co-authored-by: Carlos Duarte <[email protected]>
Co-authored-by: Gabe Fierro <[email protected]>
Co-authored-by: wcrd <[email protected]>
Co-authored-by: David Waterworth <[email protected]>
Co-authored-by: David Waterworth <[email protected]>
Co-authored-by: Jonas Bülow <[email protected]>
Co-authored-by: Jonas Bülow <[email protected]>
@gtfierro gtfierro mentioned this pull request Nov 2, 2021
Merged
gtfierro added a commit that referenced this pull request Jul 29, 2022
@gtfierro @jbkoh
@carlosduarteroa @wcrd @david-waterworth @jbulow-se @jbulow @lazlop
v1.3.0 (#348)
9e1fb4b 
* SHACL-based Brick Implementation (#341)

* adding documentation on Brick releases (#264)

* Class-based shapes (#240)

* init class shapes

* Fix Nightly Builds (#241)

* try renaming file

* trying a different release package

* Amending QUDT Definitions (#239)

* change owl:sameAs to brick:hasQUDTReference

* fix Grains -> GrainsOfMoisture

* update QUDT

* simplify generation code

* fix test to reflect new implementation

* include units, even those without a symbol

* do not make Brick Quantities also QUDT Quantity Kinds

* fixing Dimensionless reference, correcting sameAs for power

* fix typos, remove undefined QUDT units

* follow steves recommendation for ontology metadata

* updating uris

* Update Ontology Metadata (#245)

* update ontology metadata to include publisher, issued, modified and use owl.versionInfo rather than dcterms.version (which does not exist)

* make publisher a blank node

* use date of publication as release date

* remove old logic for shacl test

* amend definition for isPointOf (#251)

* Adding quantities, sensor classes for air quality (#247)

* adding quantities, sensor classes for air quality

* add air quality example file + graph

* fix CO2 tags now that it is outside of particulate matter

* add definitions

* use brick value, not brick area inside the entity property (#254)

* Regenerate air quality sensor example (#255)

* use brick value, not brick area inside the entity property

* regenerate file

* fix typo

* implement disjoint classes & add tests

* clean up code

* init class shapes

* remove old logic for shacl test

* fix typo

* implement disjoint classes & add tests

* clean up code

* update shacl

* add shacl messages

* use brickschema

Co-authored-by: Gabe Fierro <[email protected]>

* generalizing solar panel and adding its subclasses (#248)

* generalizing solar panel and adding its subclasses based on the discussion at https://groups.google.com/u/1/g/brickschema/c/hvverLxC16A/m/NlvGEvcJBgAJ

* remove Solar_Panel

* add building electrical meter example (#265)

* Fixing Meter relationship in example (#266)

* add building electrical meter example

* fix relationship for meter

* add types to external properties and classes (#267)

* Fixing ASHRAE reference (#268)

* ASHRAE URI is not real; amend to something that does not break downstream parsing

* update reference

* Fix the rest of the rdfs:seeAlso URI encoding (#275)

* fix the rest of the rdfs:seeAlso URI encoding

* add seealso encoding test

* fix test to not require URIs as the only kind of resource for definitions

* added open close status classes

* Added Water Level Alarms (#282)

* added water level alarms

* fixed issue with comma in definition

* Added Lockout and Availability Status Points (#280)

* added lockout and availability status classes

* fixed issue with using comma within definitions

* added flow sensors points (#279)

* Added New Boiler Types (#283)

* added new boiler types

* Fixed capitalization in TAG term.

Co-authored-by: Gabe Fierro <[email protected]>

* Additional air handling unit types (#274)

* added classes for more air handling unit types

* added Unit suffix to DOAS name

* Update pre-commit configuration (#286)

* bumping versions, updating precommit config

* wrong version for pre-commit

* added air system classes (#278)

Co-authored-by: Gabe Fierro <[email protected]>

* fix bad merge: remove exhaust air system (#288)

* remove equipment-flavored open-close status points

* Radiant system terminal unit classes (#270)

* added radiant system termianl unit classes

* removed non uri from see also columns

* added missing rcp class

* added Panel suffix to radiant terminal unit equip names

* Add Shapes to Brick distribution (#285)

* add comments to the shapes

* add shacl shapes to base Brick distribution

* fix typo

* building Brick is dependent on shacl shapes now

* fixup shacl shapes

* update generated shapes

* PV Systems and Entity Properties (#273)

* add entity properties for panels

* add generated solar array example

* add azimuth angle in favor of orientation

* add azimuth angle to entity properties

* add meter to solar panel example

* add rated/measured power output

* add geocoordinates, efficiency

* rated vs measured conversion efficiency

* add export annotation on poitns

* more entity properties in the example

* fix header

* maximum -> nominal

* update more entity properties

* update shapes

* update examples

* Updating Nightly Builds (#289)

* explicitly pull allegrograph container in build;regen shacl before Brick

* try newer container

* try beta brickschema w/ more logging

* bump deps

* bump deps

* update deps

* update deps

* update deps

* update deps

* update deps

* update deps

* update deps

* update deps

* update deps

* use "/" suffix for sosa namespace (#295)

* add imbalance sensors (#293)

* add stage riser; update riser defn (#296)

* value of path should be sh:class, not rdfs:range (#300)

* Add testing for examples (#299)

* add labels to units when we import them into Brick

* make sure QUDT units are encoded as such

* fixing up shapes, examples

* add example tests

* fixing up example1

* Add UFAD and diffuser equipment and points (#297)

* added ufad equipment and diffuser classes

* added ufad sensor and setpoint classes

* Fixing validation of entity properties (#301)

* working on fixing validation of entity properties

* working on tests

* add types to entity property enumerations; fix entity property test to include types

* keep as byte encoding until brickschema version bump

* fix shacl generation

* fix units in air quality example

* decimal value for shapes

* fixing shape definitions, updating encodings

* add optional stuff to shapes

* more edits

* ditch Py3.6

* bump deps

* validate entity properties

* remove reference to defunct tags.py file (#303)

* Add collection types (#269)

* working on modeling collections

* fix typo

* add PV array

* fix class name in definition

* add air loop

* add constraints to collections

* add collection inference rules

* add unit test for collection

* adding some definitions

* remove rule stuff

* move PV array to collections

* remove Make predicate

* ensure systems can be in systems; ensure collections can contain locations

* add PV array to possible contents of systems

* Adding Differential Quantities to Brick (#294)

* try differential static pressure

* working on more differential quantities, adding annotations to sensors

* fix annotation

* fix some quantities

* fix inference related to differential sensors

* fix co2 sensor query test

* V1.2.1 release (#309)

* added radiant system temperature sensor classes

* added radiant system temperature setpoints

* deleted property from embedded temp sensor

* starting v1.2.1 release

* branch stuff

* added diff temp points and water temp setpoints (#277)

Co-authored-by: Gabe Fierro <[email protected]>

* Added Differential Pressure Points (#276)

* added and restructured diff pressure points

* added a more specific tag for diff pressure to resolve over infer

Co-authored-by: Gabe Fierro <[email protected]>

* use more generic differential pressure quantity for sensors

* more stuff

* working on versions, directions

* fix transmittence typo

* make sure we do not add duplicate RDFS labels (#307)

* remove controls (#310)

* Allow Entity Properties to have generic numeric values (#311)

* add list to help entity properties have generic numeric values

* minor refactor

* update shacl tag test

* adjusting implementation of radiant temp sensors

* fix misplaced tags

* load local extenstion files

* Expand ApplicableUnits annotations (#306)

* update QUDT, use skos:broader hierarchy traversals

* switch to CelsiusTemperature

* try out Temperature

* use narrower, not broader

* traverse up, not down the skos hierarchy

* removing skos:narrower traversal

* derive units from the quantity

Co-authored-by: Gabe Fierro <[email protected]>

* fix bad merge

* first draft of release notes

Co-authored-by: Carlos Duarte <[email protected]>
Co-authored-by: Gabe Fierro <[email protected]>
Co-authored-by: Jason B. Koh <[email protected]>

* - Add Chilled Beam and subclasses (#302)

- Add Induction Unit

* removing intersection classes

* Fix RDFS Labels (#313)

* get the truth value correct when checking for rdfs labels

* more tests; ensure not adding duplicate labels

* Added brick:Relief_Damper, brick:Relief_Fan and tag:Relief (#312)

Co-authored-by: David Waterworth <[email protected]>

* System shape

* Remove redundant shape definition

* before rebase

* Changed to Collection

* Replaced remaining use of System with Collection

* fix construction of shacl rules

* Adding optimized SHACL shapes to reduce inference time (#316)

* adding optimized SHACL shapes to reduce reasoning time

* extra shacl step

* bump requirements

* bump brickschema to enable new pyshacl

* fix slow mark? try different inference schedule

* ensure tiem imported for now

* compress to shorter schedule

* fix measure inference

* fix hierarchy inference

* Reduce automated test time (#320)

* mark hierarchy inference test as slow

* use xdist for tests

* bump brickschema to proper version for testing

* bump brickschema again

* avoid "slow" tests and use worker threads in github build action

* Add Sensors from NREL Example Models (#317)

* add some missing sensors

* add coils, etc to the PR

* brick reasoning shortcut schedule

* fix measures annotation

* fix measures annotation

* run "slow" tests too

* Labels on properties and entity properties (#322)

* Some labels on relations

* Labels on entity properties

* Labels on properties

* Remove duplicate

Co-authored-by: Jonas Bülow <[email protected]>

* Fix spelling (#323)

* Ignore generated files (#327)

* Ignore generated files

* Updates from review comments

Co-authored-by: Jonas Bülow <[email protected]>

* fix Dew_Point to Dewpoint (#338)

* add misc concepts (#335)

* restructure valve hierarchy and add TMV (#333)

* restructure valve hierarchy by introducing hvac valve and adding a non-hvac valve

* fix loops

* remote incorrect tags (#340)

* add miscellaneous alarms (#331)

* more alarms

* add defs

* missing declaration

* add missing points (#329)

* add missing points

* remove Air_Humidity_Setpoint

* add def

* fix typo

Co-authored-by: Gabe Fierro <[email protected]>

* using shacl inf, not owl; switch to Brick.Entity as root class

* ensure pyshacl version

* add rules.ttl for shacl

* add CRAH (#342)

* Update files generated from source (#326)

* Update files generated from source

* Avoid repo diff after running tests

Co-authored-by: Jonas Bülow <[email protected]>

* more shacl features

* Added heating, cooling enable commands (#339)

* added heating, cooling enable commands

* updated heating/cooling enable command definitions

* Remove second skos:definition for Brick#Building (#343)

* fix entity property range

* add draft of tag rule (not that we want to do this) ; fix setpoint test

* try double-shacl, use subclassof

* bump reqs

* Update rules.ttl

* triple shacl

Co-authored-by: Jason B. Koh <[email protected]>
Co-authored-by: Carlos Duarte <[email protected]>
Co-authored-by: Gabe Fierro <[email protected]>
Co-authored-by: wcrd <[email protected]>
Co-authored-by: David Waterworth <[email protected]>
Co-authored-by: David Waterworth <[email protected]>
Co-authored-by: Jonas Bülow <[email protected]>
Co-authored-by: Jonas Bülow <[email protected]>

* Add hasRepresentation (#318)

* removing intersection classes

* fix construction of shacl rules

* re-defining brick:timeseries as an entity property and adding BACnet representation attempt

* add bacnet example; use properties from bacnet-shacl

* using shacl inf, not owl; switch to Brick.Entity as root class

* ensure pyshacl version

* add rules.ttl for shacl

* more shacl features

* fix entity property range

* add draft of tag rule (not that we want to do this) ; fix setpoint test

* try double-shacl, use subclassof

* add more BACnet annotations

* add defaultValue to read-property

* fix up RDF

* ensure properties in eprop defns are defined as ObjectProperty

* add ability to import from external files; default to object/datatype property as appropriate

* add bacnet.ttl

* bump reqs

* Update rules.ttl

* add BACnet URI

* implement "or" in shapes

* fix accidental indentation

* finish implementing OR list

* rule to infer type of eprops

* bacnet namespace

* comment out shape -- may not need w/ shacl stuff

* rdfs subproperty of rule

* Merging

* add device instance number

* fix generation of property types (#352)

* Add quantity kinds, substances as explicit annotations on all Point classes (#349)

* quantity kind modle

* setpoints

* other point types

* remove "measures", switch to brick.hasquantity

* add more annotations

* add more annotatiosn

* fix a test

* test the applicable units are correct throughout the hierarchy

* add linear/rotational speed

* fix upwards unit inheritance

* remove old definitions

* electrical -> electric

* fix typo from merge

* remove old measuredby relship

* renamed sensor

* two-pass for associating units

* use two-pass (with docs) for associating units

Co-authored-by: Jason Koh <[email protected]>

* Add IFC reference (#357)

* working on ifc reference

* define an IFC namespace, add building.ifc example

* fix example file

* better definitions of ifc properties

* fix typo

* use correct namespace for ifc

* ifc example

* define separate IFC project object

* fix ifc example

* add CSV reference, change some shape names

* entity property names + fixing tests to reflect changes

* fix ifc example

* update test file

* Fix IFC Example (#359)

* working on ifc reference

* define an IFC namespace, add building.ifc example

* fix example file

* better definitions of ifc properties

* fix typo

* use correct namespace for ifc

* ifc example

* define separate IFC project object

* fix ifc example

* add CSV reference, change some shape names

* entity property names + fixing tests to reflect changes

* fix ifc example

* update test file

* fix IFC example

* more fire alarm concepts (#336)

* more fire alarm concepts

* proper tag for fire_alarm_panel

* fire alarm panel to fire alarm control panel

* add shading concepts (#328)

* add shading concepts

* remove verbose `Level`

* missing tags

* remove TODO tag for testing the new shacl logic

Co-authored-by: Gabe Fierro <[email protected]>

* Add owl:equivalentClass SHACL Rule (#365)

* add equivalent class rule

* trigger build w/n this branch?

* better inverse rule?

* bump pytest

* fixing deps

* Group entity property shapes (#372)

* move stuff into bsh namespace; add valueshape

* fixing deps

* use brick ns for property names

* fix equivalent class evaluation

* update znt def (#374)

* Add more SHACL constraints (#373)

* adding more constraints to Brick classes

* fixing constraints and repairing tests

* move old example file

* fix broken test

* adjust the hierarchy for differential setpoints (#375)

* adjust hierarchy for differential setpoints

* remove the definition of Chilled_Water_Pump_Differential_Pressure_Deadband_Setpoint

* Deprecation support (#350)

* implement deprecation

* change property name

* add rules for handling deprecations automatically

* add deprecations file

* fix up deprecation implementation

* Revert "fix up deprecation implementation"

This reverts commit fd32ed7.

* fix up deprecation rules

* Add Outside Fan to ontology (#298)

* Add Outside Fan to ontology

* Update Fresh Air Fan definition

Co-authored-by: Gabe Fierro <[email protected]>

* address fixed definition from #369 (#383)

* Adding concepts for Dual Duct HVAC systems (#378)

* Adding concepts for Dual Duct HVAC systems

* correcting DDAHU based on ontology meeting, adding shacl shape for ddahu

* fixing small mistakes

* upload artifact per build for easier review (#388)

* upload artifact per build for easier review

* GH action for all PRs

* fix syntax

* fix syntax

* output artifact for a specific pytho nversion only.

* fix typo

* syntax

* syntax

* syntax

* remove brickshape from artifacts

* update artifact name

* fix artifact name

* explicit artifact name

* update bacnet library (#389)

* Add currentValue property (#386)

* add currentValue entity property

* add current_value example

* make brick:value property explicit in required entity property shapes

* current -> last known

* remove numeric requirement for brick:lastKnownValue, add a test

* fix property in rule

* keep brick:value

* Use ref-schema instead of old internal Brick relationships (#384)

* add ref-schema

* removing old ref definitions and replacing with ref-schema

* fix definition in example

* update ref schema

* re-add ifc attributes

* add new ref-schema; fix issues

* update ifc linking example

* Add rule for ref TimeseriesReference only on Brick Points (#392)

* New Meter/Submeter Model (#363)

* add submeters to the building meter example

* add meter relationships

* better defns

* fixing old meter example bug; fixing some tests

* fix meter reference

* add test, use correct point class

* fix unit test

* add submeter hierarchy example

* update examples to use new meter relships

* add meters/isMeteredBy rule

* add more meter shapes and new shacl generation

* fixing up building meter example

* fix relationship

* add inference for building meter

* add virtual meter class

* add virtual meter

* virtual meter as property

* fix virtual meter rule

* remove old defns

* Adjusting rules (#396)

* attach shapes directly to Brick classes

* update shapes

* update precommit

* Sort definitions during build process (#398)

* sort brick definitions during build

* update defns

* Remove extra ontology declarations (#399)

* remove ref schema ontology decl

* add test to ensure only one ontology defined

* fix labels + definitions on meter relationships

* bump version

* Adding miscellaneous classes (#404)

* sort def during precommit

* lint

* add co2 alarm sensitivity param and current ratio setpoint

* add dry cooler

* add fan command

* heating and cooling mode statuses

* light command

* humidity deadband

* freq setpoint

* low battery alarm

* add freq quantity to the setpoint

* natural gas related classes

* occ count

* add preheat commant

* pump status

* reactive energy sensor

* relay classes

* add soil temp

* add speed points

* temp adjust senosr

* thermostat status

* switch status

* transfer fan

* unoccupied heating and cooling modes

* voltage ratio

* zone cond mode status

* fix typo and add a missing class

* add missing units for eletric energy

* Add and adjust classes (#401)

* add valve position command

* add dry cooler

* missing comma

* remove equip flavored points

* add natural gas flow sensor

* add power factor sensor

* boiler command and condenser related points

* heating and cooling modes

* refrigerant level sensor

* lint def file

* add deleted points as deprecation

* fix typo

* Revert "remove equip flavored points"

This reverts commit ccd4b5a.

* add deprecation comments

* fix an old test as owl:deprecated is a label at the class level

Co-authored-by: Gabe Fierro <[email protected]>

* Misc fixes for v1.3.0 (#406)

* fix merge issue + add brick:class back

* additional small fixes

* sup/dis issues

* skip old test

* Adds EntityProperty-compatible shapes for Brick quantities (#321)

* generate shapes for all Brick quantities

* datatype on last known value

* avoid redundant work

* shade to blind and remove redundant dry cooler (#408)

* shade to blind and remove redundant dry cooler

* remove louver

* cool to cooler for dry coolyer

* fix typo

* fix bug where quantities/substances are not properly defined or validated (#409)

* Fix last known value (#410)

* fix bug where quantities/substances are not properly defined or validated

* fix brick:value on lastknownshape

* Entering/Leaving Water, not Supply/Discharge/Return Water (#411)

* starting work

* more deprecationsw

* supply water

* working on return water

* more loose ends

* more fixes

* removing old definitions

* generate deprecations

* fix definitions

* commit definitions

* fixing class names + definitions

* update names

* fix point

* annotate subclass

* fix subclass generation

* fixing tests

* avlid testing dprecated concepts

* fixing test selection

* ensure deprecation message

Co-authored-by: Jason B. Koh <[email protected]>
Co-authored-by: Carlos Duarte <[email protected]>
Co-authored-by: Gabe Fierro <[email protected]>
Co-authored-by: wcrd <[email protected]>
Co-authored-by: David Waterworth <[email protected]>
Co-authored-by: David Waterworth <[email protected]>
Co-authored-by: Jonas Bülow <[email protected]>
Co-authored-by: Jonas Bülow <[email protected]>
Co-authored-by: Jason Koh <[email protected]>
Co-authored-by: lazlop <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@gtfierro gtfierro gtfierro approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@carlosduarteroa @gtfierro