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.

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

Issue639 actuator travel #699

Open
wants to merge 27 commits into
base: issue639_actuatorTravel
Choose a base branch
from
Open
Changes from 1 commit
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
9864653
Add missing weather variable warning to data_manager
EttoreZ May 14, 2024
43cb2ae
Merge branch 'master' into issue500_update_data_manager
EttoreZ May 14, 2024
45134e8
Update release notes
EttoreZ May 14, 2024
28b2aa7
Moved warning to _append_csv_data and update release notes
EttoreZ May 14, 2024
a1a54d4
Update release notes
EttoreZ May 14, 2024
71b5e01
Merge pull request #645 from ibpsa/issue500_update_data_manager
dhblum May 14, 2024
be80b23
First implementation of actuator travel KPI using bestest_hydronic_he…
terrancelu92 May 28, 2024
dedcec4
Revert the unecessary change
terrancelu92 May 28, 2024
0888d5d
Update the mapping of the actuators in all cases
terrancelu92 May 28, 2024
247fcf8
Update core_kpi.rst
terrancelu92 May 31, 2024
44132be
Enable remote debug function
terrancelu92 Aug 13, 2024
1780afe
Enable debug environment by ptvsd
terrancelu92 Aug 16, 2024
28c4c3d
Add parser development environment
terrancelu92 Oct 15, 2024
1f6757f
Adding IBPSA and IDEAS in the docker container
terrancelu92 Oct 15, 2024
8e464e1
Test the parsing.py using bestest_hydronic_heat_pump
terrancelu92 Oct 29, 2024
db62bae
Update the bestest_hydronic_heat_pump with new kpi fmu
terrancelu92 Oct 29, 2024
57a8110
Update the kpi_calculator for new testcases; Add a json file for exis…
terrancelu92 Nov 1, 2024
26136d4
Revert the debugging environment: required library
terrancelu92 Nov 1, 2024
c9014b9
Revert the debugging environment files
terrancelu92 Nov 1, 2024
a855a90
Revert all these changes back to those in remote issue 639 repo
terrancelu92 Nov 1, 2024
a6e8a62
Revert baseline.py
terrancelu92 Nov 1, 2024
5027455
Update kpi_calculator.py
terrancelu92 Nov 1, 2024
c698587
Update kpi_calculator.py
terrancelu92 Nov 1, 2024
1eaef77
Update kpi_calculator.py
terrancelu92 Nov 10, 2024
e5ac5a5
Revert "Update kpi_calculator.py"
terrancelu92 Nov 10, 2024
ee16163
Update kpi_calculator.py
terrancelu92 Nov 10, 2024
7be8520
Correct some control actuator variable names
terrancelu92 Nov 12, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Add missing weather variable warning to data_manager
EttoreZ committed May 14, 2024
commit 98646533784f1a02afc9ecaa4da5135841085e6d
10 changes: 9 additions & 1 deletion data/data_manager.py
Original file line number Diff line number Diff line change
@@ -427,7 +427,8 @@ def load_data_and_jsons(self):

# Get zone and boundary data keys allowed
zon_keys, bou_keys = self._get_zone_and_boundary_keys()

weather_keys = list(self.categories['weather'].keys())

# Initialize test case data frame
self.case.data = \
pd.DataFrame(index=index).rename_axis('time')
@@ -436,6 +437,13 @@ def load_data_and_jsons(self):
for f in files:
df = pd.read_csv(z_fmu.open(f))
cols = df.keys()

# Check if all weather variables are included in weather.csv
if 'weather' in f:
if not set(cols) <= set(weather_keys):
warnings.warn('The file weather.csv is missing '\
'the following variables '+str(set(weather_keys).difference(set(cols)))+'.', Warning)

if 'time' in cols:
for col in cols.drop('time'):
# Check that column has any of the allowed data keys