diff --git a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml index 73dccaaee..1b74a5732 100644 --- a/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/ABSTRACT.yaml @@ -1166,6 +1166,7 @@ WDPC: - differential_pressure_setpoint MWDPC: + guid: "80c5dfcc-c555-42ed-90ff-6807feca1f5f" description: "Minimum water differential pressure control." is_abstract: true uses: @@ -4643,6 +4644,7 @@ CHDXVSC: - overload_compressor_alarm CHDXVSC2X: + guid: "cddb43aa-3122-44e2-96f7-906259bb3e8c" description: "Dual compressor variable speed control." is_abstract: true uses: @@ -6428,6 +6430,7 @@ INVOPWM: INVOPWM2X: + guid: "14d07b5f-bb1e-43ca-be08-d3a59454e49e" description: "Dual inverter (VFD) output power monitoring." is_abstract: true implements: @@ -6443,6 +6446,7 @@ INVOPWM2X: INVIPWM2X: + guid: "9fd6b127-7925-427e-ae1b-3736fbec1e21" description: "Dual inverter (VFD) input power monitoring." is_abstract: true implements: @@ -6763,6 +6767,7 @@ RFSS2X: - OPERATIONAL RFSS3X: + guid: "f5b9e0b4-e561-469e-a74f-99e849747191" description: "Return fan start-stop and feedback with three fans." is_abstract: true opt_uses: @@ -6826,6 +6831,7 @@ RFVSC2X: - OPERATIONAL RFVSC3X: + guid: "01199f72-169f-4a2d-a53e-068b52070f31" description: "Return fan variable speed control with feedback and sensoring for three fans." is_abstract: true opt_uses: diff --git a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml index a0c78093c..9c0906c5a 100644 --- a/ontology/yaml/resources/HVAC/entity_types/AHU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/AHU.yaml @@ -4140,6 +4140,7 @@ AHU_CHWSC_ECON_FDPM_HWSC_SFSS_SFVSC_SSPC_SDHC_RTM: - smoke_alarm AHU_SFSS4X_SFVSC4X_RFSS3X_RFVSC3X_CHWSC_HWSC_ECON_EDBPC_SARC_SSPC_RD_OAFMC_EFM: + guid: "187ad041-6b1e-4ee5-aabb-69dc8c287bdd" description: "Cooling and heating AHU with 4 supply and 3 return fans, supply air reset control, building and supply static pressure control, return damper flow control and exhaust flow monitoring." is_canonical: true @@ -4162,6 +4163,7 @@ AHU_SFSS4X_SFVSC4X_RFSS3X_RFVSC3X_CHWSC_HWSC_ECON_EDBPC_SARC_SSPC_RD_OAFMC_EFM: - smoke_alarm AHU_SFSS4X_SFVSC4X_RFSS3X_RFVSC3X_CHWSC_HWSC_ECON_EDBPC_SARC_SSPC_RD_OAFMC: + guid: "dca00b39-6816-4d59-b3b6-2b3a429edf8b" description: "Cooling and heating AHU with 4 supply and 3 return fans, supply air reset control, building and supply static pressure control and return damper flow control." is_canonical: true @@ -4183,6 +4185,7 @@ AHU_SFSS4X_SFVSC4X_RFSS3X_RFVSC3X_CHWSC_HWSC_ECON_EDBPC_SARC_SSPC_RD_OAFMC: - smoke_alarm AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_CHWSC_HWSC_ECON_EDBPC_SARC_SSPC_RD_OAFMC: + guid: "5a3034e7-0a17-416c-b974-55072d52d3e4" description: "Cooling and heating AHU with 2 supply and 2 return fans, supply air reset control, building and supply static pressure control and return damper flow control." is_canonical: true @@ -4204,6 +4207,7 @@ AHU_SFSS2X_SFVSC2X_RFSS2X_RFVSC2X_CHWSC_HWSC_ECON_EDBPC_SARC_SSPC_RD_OAFMC: - smoke_alarm AHU_SFSS_SFVSC_EFSS_EFVSC_CHWSC_HWSC_ECON_EDBPC_SARC_SSPC_OAFMC: + guid: "36c1740d-1eaa-4bae-8779-269cdfc0c5a0" description: "Multi-zone cooling and heatinfg AHU with supply air reset control and supply static pressure control." is_canonical: true implements: diff --git a/ontology/yaml/resources/HVAC/entity_types/CH.yaml b/ontology/yaml/resources/HVAC/entity_types/CH.yaml index e3ded313e..36ea9e354 100644 --- a/ontology/yaml/resources/HVAC/entity_types/CH.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/CH.yaml @@ -610,6 +610,7 @@ CH_SS_DX3SCHWC_CWSISOVM_CWRISOVM_CHWSWISOVM_CHWDPM_CWDT_CHWDT_RCKTM: - RCKTM CH_SS_DX4SWC_RWTM_REFSM2X_REFPM2X_CPC: + guid: "6de8a9fd-87c5-4190-b4e2-402ede91900d" description: "Four stage air cooled chiller with return water temperature monitoring, circulation pump monitoring and two circuit refrigerant monitoring." is_canonical: true implements: @@ -622,6 +623,7 @@ CH_SS_DX4SWC_RWTM_REFSM2X_REFPM2X_CPC: - CPC CH_SS_DX2SWC_CHDXVSC2X_RWTM_MWDPC_RWISOVM_REFSM2X_REFPM2X_CPC_INVIPWM2X_INVOPWM2X: + guid: "cf101310-f825-4637-9948-f036ecbb4210" description: "Two stage air cooled chiller with dual compressor variable speed control, return water isolation valve, minimum differential pressure control, return water temperature monitoring, two circuit refrigerant monitoring, circulation pump monitoring and input/output inverter power monitoring." is_canonical: true diff --git a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml index 127281a54..cf9863d25 100644 --- a/ontology/yaml/resources/HVAC/entity_types/MAU.yaml +++ b/ontology/yaml/resources/HVAC/entity_types/MAU.yaml @@ -699,6 +699,7 @@ MAU_SFSS2X_SFVSC2X_CHWSC_HWSC_SSPC_VOADM_FDPM_ZSPM_OAFM: - smoke_alarm MAU_DFSS_DFVSC_DSP_CHWDC_HWDC_OADM_ZSPM_OA: + guid: "9ba6dc9b-1b5b-4f05-8be2-2ff4b0bb7390" description: "Single zone heating and cooling make-up air unit with zone static pressure control and outside air temperature monitoring." is_canonical: true implements: diff --git a/tools/global_setup.bat b/tools/global_setup.bat deleted file mode 100644 index c629812ba..000000000 --- a/tools/global_setup.bat +++ /dev/null @@ -1,47 +0,0 @@ -@echo off -ECHO "Starting setup..." - -:ontology_validator_setup -ECHO "Starting ontology validator setup" -CD validators\ontology_validator -START py setup.py install -ECHO "Finished ontology validator setup" -CD ..\..\ - -:instance_validator_setup -ECHO "Starting instance validator setup" -CD validators\instance_validator -START py setup.py install -ECHO "Finished instance validator setup" -CD ..\.. - -:explorer_setup -ECHO "Starting explorer setup" -CD explorer\ -START py setup.py install -ECHO "Finished explorer setup" -CD .. - -:guid_generator_setup -ECHO "Starting GUID generator setup" -CD guid_generator -START py setup.py install -ECHO "Finished GUID generator setup" -CD .. - -:scoring_setup -ECHO "Starting scoring setup" -CD Scoring -START py setup.py install -ECHO "Finished Scoring setup" -CD .. - -:rdf_generator_setup -ECHO "Starting RDF Generator setup" -CD rdf_generator -START py setup.py install -ECHO "Finished RDF Generator setup" -CD .. - -ECHO "Setup finished!" -PAUSE diff --git a/tools/global_setup.sh b/tools/global_setup.sh deleted file mode 100755 index 86d1c4025..000000000 --- a/tools/global_setup.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env bash -set -e - -cd "$(dirname "${0}")" -source "scripts/lib.sh" - -find_setup_py_projects | while read -r PROJECT_PATH -do - pushd "${PROJECT_PATH}" > /dev/null - "${PYTHON}" setup.py install - popd > /dev/null -done diff --git a/tools/pip_install.bat b/tools/pip_install.bat index 43f707dea..3dbd06687 100644 --- a/tools/pip_install.bat +++ b/tools/pip_install.bat @@ -36,5 +36,18 @@ START py -m pip install . ECHO "Finished ABEL setup" CD .. +:dbo_explorer_setup +ECHO 'Starting DBO Explorer" +CD explorer +START py -m pip install . +ECHO "Finished DBO Explorer setup" +CD .. + +:building_config_scoring_setup +ECHO "Starting scoring setup" +CD Scoring +START py -m pip install . +ECHO "Finished scoring setup" + ECHO "Setup finished!" PAUSE