Data refactoring

.github/workflows/openstudio_standards_database.yml

@@ -0,0 +1,43 @@
+# This workflow will check formatting with Black, install Python dependencies,
+# and run tests with pytest
+on:
+  pull_request:
+    path:
+      - 'data/openstudio_standards_data'
+jobs:
+  black-formatting-check:
+    name: Black formatting check
+    runs-on: 'ubuntu-latest'
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+        # This will halt the action if formatting fails
+         # Note: This will also fail if there are syntax errors
+      - uses: psf/black@stable
+        with:
+            version: "22.12.0"
+  run-unit-tests:
+    name: Run unit tests
+    runs-on: 'ubuntu-latest'
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v3
+      - name: Setup Python
+        uses: actions/setup-python@v4
+        with:
+          python-version: '3.10'
+          cache: 'pipenv'
+      - name: Install pipenv
+        run: curl https://raw.githubusercontent.com/pypa/pipenv/master/get-pipenv.py | python
+        working-directory: 'data/openstudio_standards_data'
+      - name: Install dpendencies
+        run: pipenv install --dev
+        working-directory: 'data/openstudio_standards_data'
+      - name: Run pytests
+        # This will halt the action if any of the tests fail
+        run: pipenv run pytest -v
+        working-directory: 'data/openstudio_standards_data'

.gitignore

@@ -48,3 +48,37 @@ coverage/
 /data/standards/openstudio_standards_duplicates_log.csv
 /data/standards/export
 /data/geometry/../*.osw
+/data/openstudio_standards_data/Pipfile.lock
+
+## Python ignores
+# Byte-compiled / optimized / DLL files
+__pycache__/
+*.py[cod]
+*$py.class
+
+# C extensions
+*.so
+
+# Distribution / packaging
+.Python
+build/
+develop-eggs/
+dist/
+downloads/
+eggs/
+.eggs/
+lib/
+lib64/
+parts/
+sdist/
+var/
+wheels/
+pip-wheel-metadata/
+share/python-wheels/
+*.egg-info/
+.installed.cfg
+*.egg
+MANIFEST
+
+
+

.yardopts

@@ -16,6 +16,10 @@ lib/openstudio-standards/prototypes/**/*.rb
 lib/openstudio-standards/utilities/**/*.rb
 lib/openstudio-standards/weather/**/*.rb
 lib/openstudio-standards/refs/references.rb
+lib/openstudio-standards/schedules/**/*.rb
+lib/openstudio-standards/geometry/**/*.rb
+lib/openstudio-standards/create_typical/**/*.rb
+
 -
 docs/Home.md
 docs/UserQuickStartGuide.md

Jenkinsfile

@@ -1,5 +1,5 @@
 //Jenkins pipelines are stored in shared libaries. Please see: https://github.com/tijcolem/nrel_cbci_jenkins_libs
 
-@Library('cbci_shared_libs') _
+//@Library('cbci_shared_libs') _
 
-openstudio_standards()
+//openstudio_standards()

Jenkinsfile_develop

@@ -1,5 +1,5 @@
 //Jenkins pipelines are stored in shared libaries. Please see: https://github.com/tijcolem/nrel_cbci_jenkins_libs
 
-@Library('cbci_shared_libs') _
+//@Library('cbci_shared_libs') _
 
-openstudio_standards_develop()
+//openstudio_standards_develop()

data/geometry/ASHRAE90120042007RetailStandalone.osm

@@ -1437,7 +1437,7 @@ OS:SpaceType,
   {a3a0739e-a571-406d-be23-3a1109c00149}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   Retail,                                 !- Standards Building Type
-  Back_Space;                             !- Standards Space Type
+  storage;      !- Standards Space Type
 
 OS:Rendering:Color,
   {a3a0739e-a571-406d-be23-3a1109c00149}, !- Handle
@@ -1454,7 +1454,7 @@ OS:SpaceType,
   {76c09621-8ebd-4f85-9aa1-e7b662cba73a}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   Retail,                                 !- Standards Building Type
-  Entry;                                  !- Standards Space Type
+  retail;      !- Standards Space Type
 
 OS:Rendering:Color,
   {76c09621-8ebd-4f85-9aa1-e7b662cba73a}, !- Handle
@@ -1471,7 +1471,7 @@ OS:SpaceType,
   {fa5b1461-b656-4d07-a74e-d98fc640db1d}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   Retail,                                 !- Standards Building Type
-  Point_of_Sale;                          !- Standards Space Type
+  retail;      !- Standards Space Type
 
 OS:Rendering:Color,
   {fa5b1461-b656-4d07-a74e-d98fc640db1d}, !- Handle
@@ -1488,7 +1488,7 @@ OS:SpaceType,
   {881fc831-ec2a-47eb-9248-d56a79ee8cb0}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   Retail,                                 !- Standards Building Type
-  Retail;                                 !- Standards Space Type
+  retail;      !- Standards Space Type
 
 OS:Rendering:Color,
   {881fc831-ec2a-47eb-9248-d56a79ee8cb0}, !- Handle

data/geometry/ASHRAE90120042007Warehouse.osm

@@ -1050,7 +1050,7 @@ OS:SpaceType,
   {397a9834-ca46-44f2-bf97-1aa5fc23a67d}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   Warehouse,                              !- Standards Building Type
-  Bulk;                                   !- Standards Space Type
+  storage;      !- Standards Space Type
 
 OS:Rendering:Color,
   {397a9834-ca46-44f2-bf97-1aa5fc23a67d}, !- Handle
@@ -1067,7 +1067,7 @@ OS:SpaceType,
   {f4306e95-b5d7-4c53-b22d-f8fa8e9ac849}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   Warehouse,                              !- Standards Building Type
-  Fine;                                   !- Standards Space Type
+  storage;      !- Standards Space Type
 
 OS:Rendering:Color,
   {f4306e95-b5d7-4c53-b22d-f8fa8e9ac849}, !- Handle
@@ -1084,7 +1084,7 @@ OS:SpaceType,
   {c5bf423d-0ee6-40ac-b721-797e5dbdcfa2}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   Warehouse,                              !- Standards Building Type
-  Office;                                 !- Standards Space Type
+  office;      !- Standards Space Type
 
 OS:Rendering:Color,
   {c5bf423d-0ee6-40ac-b721-797e5dbdcfa2}, !- Handle

data/geometry/ASHRAE90120102013Warehouse.osm

@@ -1662,7 +1662,7 @@ OS:SpaceType,
   {397a9834-ca46-44f2-bf97-1aa5fc23a67d}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   Warehouse,                              !- Standards Building Type
-  Bulk;                                   !- Standards Space Type
+  storage;      !- Standards Space Type
 
 OS:Rendering:Color,
   {397a9834-ca46-44f2-bf97-1aa5fc23a67d}, !- Handle
@@ -1679,7 +1679,7 @@ OS:SpaceType,
   {f4306e95-b5d7-4c53-b22d-f8fa8e9ac849}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   Warehouse,                              !- Standards Building Type
-  Fine;                                   !- Standards Space Type
+  storage;      !- Standards Space Type
 
 OS:Rendering:Color,
   {f4306e95-b5d7-4c53-b22d-f8fa8e9ac849}, !- Handle
@@ -1696,7 +1696,7 @@ OS:SpaceType,
   {c5bf423d-0ee6-40ac-b721-797e5dbdcfa2}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   Warehouse,                              !- Standards Building Type
-  Office;                                 !- Standards Space Type
+  office;      !- Standards Space Type
 
 OS:Rendering:Color,
   {c5bf423d-0ee6-40ac-b721-797e5dbdcfa2}, !- Handle

data/geometry/ASHRAE9012010RetailStandalone.osm

@@ -1574,7 +1574,7 @@ OS:SpaceType,
   {167cc7b7-8eac-4e49-b28e-caa335790466}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   Retail,                                 !- Standards Building Type
-  Back_Space;                             !- Standards Space Type
+  storage;      !- Standards Space Type
 
 OS:Rendering:Color,
   {167cc7b7-8eac-4e49-b28e-caa335790466}, !- Handle
@@ -1591,7 +1591,7 @@ OS:SpaceType,
   {0f7e4bc8-2048-478f-affd-4076526a56ae}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   Retail,                                 !- Standards Building Type
-  Entry;                                  !- Standards Space Type
+  retail;      !- Standards Space Type
 
 OS:Rendering:Color,
   {0f7e4bc8-2048-478f-affd-4076526a56ae}, !- Handle
@@ -1608,7 +1608,7 @@ OS:SpaceType,
   {d71c19c2-0ea4-4baf-a26a-d5fd227fcca6}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   Retail,                                 !- Standards Building Type
-  Point_of_Sale;                          !- Standards Space Type
+  retail;      !- Standards Space Type
 
 OS:Rendering:Color,
   {d71c19c2-0ea4-4baf-a26a-d5fd227fcca6}, !- Handle
@@ -1625,7 +1625,7 @@ OS:SpaceType,
   {72a5f3a5-1e45-49c4-b0dc-cf0379012f35}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   Retail,                                 !- Standards Building Type
-  Retail;                                 !- Standards Space Type
+  retail;      !- Standards Space Type
 
 OS:Rendering:Color,
   {72a5f3a5-1e45-49c4-b0dc-cf0379012f35}, !- Handle

data/geometry/ASHRAE9012010SuperMarket.osm

@@ -2435,7 +2435,7 @@ OS:SpaceType,
   {d5a4d3a8-a5fd-4aaf-806d-a06898d735bb}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   SuperMarket,                            !- Standards Building Type
-  Sales;                                  !- Standards Space Type
+  retail;      !- Standards Space Type
 
 OS:Rendering:Color,
   {584d5941-6807-4c85-a8e1-f325c9415f01}, !- Handle
@@ -2452,7 +2452,7 @@ OS:SpaceType,
   {0fd86b86-8514-428b-983a-e05274d038f3}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   SuperMarket,                            !- Standards Building Type
-  Produce;                                !- Standards Space Type
+  retail;      !- Standards Space Type
 
 OS:Rendering:Color,
   {fd47fad6-64f7-4aef-9625-215792b21da0}, !- Handle
@@ -2469,7 +2469,7 @@ OS:SpaceType,
   {85790e85-be38-4905-859f-466ed899db55}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   SuperMarket,                            !- Standards Building Type
-  Deli;                                   !- Standards Space Type
+  retail;      !- Standards Space Type
 
 OS:Rendering:Color,
   {e61d1fd0-7c51-4d2d-a700-6916a13f4e39}, !- Handle
@@ -2486,7 +2486,7 @@ OS:SpaceType,
   {cf17cb7d-482f-438f-a0c4-1a5f373a25d8}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   SuperMarket,                            !- Standards Building Type
-  Bakery;                                 !- Standards Space Type
+  food preparation;      !- Standards Space Type
 
 OS:Rendering:Color,
   {5865b2f2-0f2b-4625-a902-27f01e50d17d}, !- Handle
@@ -2503,7 +2503,7 @@ OS:SpaceType,
   {191d53fa-876c-4ae5-b385-65c995be31d6}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   SuperMarket,                            !- Standards Building Type
-  Office;                                 !- Standards Space Type
+  office;      !- Standards Space Type
 
 OS:Rendering:Color,
   {c683d2c8-6126-4dfd-bd42-c3e2177c19f0}, !- Handle
@@ -2520,7 +2520,7 @@ OS:SpaceType,
   {aabefe66-d579-4405-bf24-3f5576b42761}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   SuperMarket,                            !- Standards Building Type
-  Meeting;                                !- Standards Space Type
+  conference/meeting/multipurpose;      !- Standards Space Type
 
 OS:Rendering:Color,
   {15f77b5e-c5c3-4b09-aad3-2d4e57dc3e7c}, !- Handle
@@ -2537,7 +2537,7 @@ OS:SpaceType,
   {3591a590-5c05-47aa-86a7-b9239bec0c25}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   SuperMarket,                            !- Standards Building Type
-  Dining;                                 !- Standards Space Type
+  dining;      !- Standards Space Type
 
 OS:Rendering:Color,
   {e20219b6-54ee-40e5-a565-e509c437629a}, !- Handle
@@ -2554,7 +2554,7 @@ OS:SpaceType,
   {820f5e17-d483-4323-a081-c2609441316e}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   SuperMarket,                            !- Standards Building Type
-  Restroom;                               !- Standards Space Type
+  restroom;      !- Standards Space Type
 
 OS:Rendering:Color,
   {c02273df-695e-41c6-bdb5-86d9c30f802c}, !- Handle
@@ -2571,7 +2571,7 @@ OS:SpaceType,
   {95077061-b895-41e0-a684-f88fbf79e327}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   SuperMarket,                            !- Standards Building Type
-  Elec/MechRoom;                          !- Standards Space Type
+  electrical/mechanical;      !- Standards Space Type
 
 OS:Rendering:Color,
   {e40b28ee-1d55-46c6-9b59-e70c8ae0d0af}, !- Handle
@@ -2588,7 +2588,7 @@ OS:SpaceType,
   {a748bbb9-c181-4842-a74f-8c4aed370da6}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   SuperMarket,                            !- Standards Building Type
-  Corridor;                               !- Standards Space Type
+  corridor;      !- Standards Space Type
 
 OS:Rendering:Color,
   {49694992-18d0-4a74-9162-04a571406547}, !- Handle
@@ -2605,7 +2605,7 @@ OS:SpaceType,
   {823782b0-6a99-4868-b14c-a00a41c45e53}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   SuperMarket,                            !- Standards Building Type
-  Vestibule;                              !- Standards Space Type
+  lobby;      !- Standards Space Type
 
 OS:Rendering:Color,
   {7a66eb1c-2621-4acc-ac8f-8333f93ca888}, !- Handle
@@ -2622,7 +2622,7 @@ OS:SpaceType,
   {8f01cc13-2d9b-4cd7-b3e6-0e73f34ad81c}, !- Group Rendering Name
   ,                                       !- Design Specification Outdoor Air Object Name
   SuperMarket,                            !- Standards Building Type
-  DryStorage;                             !- Standards Space Type
+  storage;      !- Standards Space Type
 
 OS:Rendering:Color,
   {8ce4180d-d9e9-4145-9f5e-fbe6401853ad}, !- Handle