k_wells/simplified_radiosity_algorithm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/master'

Browse Source 
# Conflicts:
#	.idea/simplified_radiosity_algorith.iml
This commit is contained in:
Pilar 2023-01-10 10:51:33 -05:00
commit 488a9285bf
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
.idea/workspace.xml Normal file
View File

@ -0,0 +1,33 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="ChangeListManager">
<list default="true" id="4c7bf1c6-da28-477b-b275-5014c62ce46d" name="Changes" comment="" />
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
<option name="HIGHLIGHT_NON_ACTIVE_CHANGELIST" value="false" />
<option name="LAST_RESOLUTION" value="IGNORE" />
</component>
<component name="Git.Settings">
<option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$" />
</component>
<component name="ProjectId" id="216ShsKACHHiLkoSXuuyApaHXJf" />
<component name="ProjectViewState">
<option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
<component name="PropertiesComponent">
<property name="RunOnceActivity.OpenProjectViewOnStart" value="true" />
<property name="RunOnceActivity.ShowReadmeOnStart" value="true" />
</component>
<component name="SpellCheckerSettings" RuntimeDictionaries="0" Folders="0" CustomDictionaries="0" DefaultDictionary="application-level" UseSingleDictionary="true" transferred="true" />
<component name="TaskManager">
<task active="true" id="Default" summary="Default task">
<changelist id="4c7bf1c6-da28-477b-b275-5014c62ce46d" name="Changes" comment="" />
<created>1637260166200</created>
<option name="number" value="Default" />
<option name="presentableId" value="Default" />
<updated>1637260166200</updated>
</task>
<servers />
</component>
</project>

3
simplified_radiosity_algorithm.py
View File

@ -108,12 +108,14 @@ class SimplifiedRadiosityAlgorithm:
"""
for radiation in self.radiation:
city_object_name = radiation.columns.values.tolist()[1].split(':')[1]
print(city_object_name)
if building_name is not None:
if city_object_name != building_name:
# todo: in case there is a specific building name defined, then assign values only to that specific building
continue
building = city.city_object(city_object_name)
print(f'[{building.name}], {city_object_name}')
for column in radiation.columns.values:
if column == cte.MONTH:
continue
@ -136,7 +138,6 @@ class SimplifiedRadiosityAlgorithm:
def _create_cli_file(self, key):
file = self._city.climate_file
print(file)
days_in_month = [31, 28, 31, 30, 31, 30, 31, 31, 30, 31, 30, 31]
WeatherFactory(key, self._city, file_name=self._weather_file_name).enrich()
content = self._city.name + '\n'