Skip to content

Commit

Permalink
fix(comfort): Fix bugs in recipes ignoring comfort parameters
Browse files Browse the repository at this point in the history
  • Loading branch information
@chriswmackey
chriswmackey authored and Chris Mackey committed Sep 15, 2023
1 parent 5bd1f24 commit e72cc04
Show file tree
Hide file tree
Showing 25 changed files with 347 additions and 353 deletions.
20 changes: 10 additions & 10 deletions lbt_recipes/adaptive_comfort_map/flow/dependencies/comfort_mapping_entry_point.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ def is_script(self):
return False

def command(self):
return 'ladybug-comfort epw air-speed-json weather.epw enclosure_info.json --multiply-by {multiply_by} --indoor-air-speed in_speed.txt --outdoor-air-speed out_speed.txt --run-period "{run_period}" --output-file air_speed.json'.format(multiply_by=self.multiply_by, run_period=self.run_period)
return 'ladybug-comfort epw air-speed-json weather.epw enclosure_info.json --multiply-by {multiply_by} --indoor-air-speed in_speed.txt --outdoor-air-speed out_speed.txt --run-period "{run_period}" --output-file air_speed.json'.format(run_period=self.run_period, multiply_by=self.multiply_by)

def output(self):
return {
Expand Down Expand Up @@ -142,7 +142,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/ladybug-comfort:0.16.5'
return 'docker.io/ladybugtools/ladybug-comfort:0.16.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -213,7 +213,7 @@ def is_script(self):
return False

def command(self):
return 'ladybug-comfort map air result.sql enclosure_info.json weather.epw --run-period "{run_period}" --{metric} --output-file air.csv'.format(run_period=self.run_period, metric=self.metric)
return 'ladybug-comfort map air result.sql enclosure_info.json weather.epw --run-period "{run_period}" --{metric} --output-file air.csv'.format(metric=self.metric, run_period=self.run_period)

def output(self):
return {
Expand Down Expand Up @@ -248,7 +248,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/ladybug-comfort:0.16.5'
return 'docker.io/ladybugtools/ladybug-comfort:0.16.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -363,7 +363,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/ladybug-comfort:0.16.5'
return 'docker.io/ladybugtools/ladybug-comfort:0.16.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -476,7 +476,7 @@ def is_script(self):
return False

def command(self):
return 'ladybug-comfort map shortwave-mrt weather.epw indirect.ill direct.ill ref.ill sun-up-hours.txt --contributions dynamic --transmittance-contribs dyn_shade --trans-schedule-json trans_schedules.json --solarcal-par "{solarcal_par}" --run-period "{run_period}" --{indirect_is_total} --output-file shortwave.csv'.format(indirect_is_total=self.indirect_is_total, run_period=self.run_period, solarcal_par=self.solarcal_par)
return 'ladybug-comfort map shortwave-mrt weather.epw indirect.ill direct.ill ref.ill sun-up-hours.txt --contributions dynamic --transmittance-contribs dyn_shade --trans-schedule-json trans_schedules.json --solarcal-par "{solarcal_par}" --run-period "{run_period}" --{indirect_is_total} --output-file shortwave.csv'.format(run_period=self.run_period, solarcal_par=self.solarcal_par, indirect_is_total=self.indirect_is_total)

def output(self):
return {
Expand Down Expand Up @@ -517,7 +517,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/ladybug-comfort:0.16.5'
return 'docker.io/ladybugtools/ladybug-comfort:0.16.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -652,7 +652,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/ladybug-comfort:0.16.5'
return 'docker.io/ladybugtools/ladybug-comfort:0.16.47'

@property
def image_workdir(self):
Expand Down Expand Up @@ -768,14 +768,14 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/ladybug-comfort:0.16.5'
return 'docker.io/ladybugtools/ladybug-comfort:0.16.47'

@property
def image_workdir(self):
return '/home/ladybugbot/run'


class _ComfortMappingEntryPoint_147cac13Orchestrator(luigi.WrapperTask):
class _ComfortMappingEntryPoint_b3d2dfdeOrchestrator(luigi.WrapperTask):
"""Runs all the tasks in this module."""
# user input for this module
_input_params = luigi.DictParameter()
Expand Down
34 changes: 17 additions & 17 deletions ...cipes/adaptive_comfort_map/flow/dependencies/dependencies/radiance_contrib_entry_point.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(fixed_radiance_parameters=self.fixed_radiance_parameters, output_format=self.output_format, radiance_parameters=self.radiance_parameters, order_by=self.order_by, sensor_count=self.sensor_count, conversion=self.conversion, header=self.header)
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(header=self.header, sensor_count=self.sensor_count, conversion=self.conversion, order_by=self.order_by, radiance_parameters=self.radiance_parameters, output_format=self.output_format, fixed_radiance_parameters=self.fixed_radiance_parameters)

def output(self):
return {
Expand Down Expand Up @@ -163,7 +163,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.36'

@property
def image_workdir(self):
Expand Down Expand Up @@ -254,7 +254,7 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance dc scontrib scene.oct grid.pts suns.mod --{calculate_values} --sensor-count {sensor_count} --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --output results.ill --order-by-{order_by} --{header}-header'.format(fixed_radiance_parameters=self.fixed_radiance_parameters, calculate_values=self.calculate_values, output_format=self.output_format, radiance_parameters=self.radiance_parameters, order_by=self.order_by, sensor_count=self.sensor_count, conversion=self.conversion, header=self.header)
return 'honeybee-radiance dc scontrib scene.oct grid.pts suns.mod --{calculate_values} --sensor-count {sensor_count} --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --output results.ill --order-by-{order_by} --{header}-header'.format(header=self.header, sensor_count=self.sensor_count, conversion=self.conversion, calculate_values=self.calculate_values, order_by=self.order_by, radiance_parameters=self.radiance_parameters, output_format=self.output_format, fixed_radiance_parameters=self.fixed_radiance_parameters)

def output(self):
return {
Expand Down Expand Up @@ -296,7 +296,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.36'

@property
def image_workdir(self):
Expand Down Expand Up @@ -390,7 +390,7 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(fixed_radiance_parameters=self.fixed_radiance_parameters, output_format=self.output_format, radiance_parameters=self.radiance_parameters, order_by=self.order_by, sensor_count=self.sensor_count, conversion=self.conversion, header=self.header)
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(header=self.header, sensor_count=self.sensor_count, conversion=self.conversion, order_by=self.order_by, radiance_parameters=self.radiance_parameters, output_format=self.output_format, fixed_radiance_parameters=self.fixed_radiance_parameters)

def output(self):
return {
Expand Down Expand Up @@ -432,7 +432,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.36'

@property
def image_workdir(self):
Expand Down Expand Up @@ -526,7 +526,7 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(fixed_radiance_parameters=self.fixed_radiance_parameters, output_format=self.output_format, radiance_parameters=self.radiance_parameters, order_by=self.order_by, sensor_count=self.sensor_count, conversion=self.conversion, header=self.header)
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(header=self.header, sensor_count=self.sensor_count, conversion=self.conversion, order_by=self.order_by, radiance_parameters=self.radiance_parameters, output_format=self.output_format, fixed_radiance_parameters=self.fixed_radiance_parameters)

def output(self):
return {
Expand Down Expand Up @@ -568,7 +568,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.36'

@property
def image_workdir(self):
Expand Down Expand Up @@ -662,7 +662,7 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(fixed_radiance_parameters=self.fixed_radiance_parameters, output_format=self.output_format, radiance_parameters=self.radiance_parameters, order_by=self.order_by, sensor_count=self.sensor_count, conversion=self.conversion, header=self.header)
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(header=self.header, sensor_count=self.sensor_count, conversion=self.conversion, order_by=self.order_by, radiance_parameters=self.radiance_parameters, output_format=self.output_format, fixed_radiance_parameters=self.fixed_radiance_parameters)

def output(self):
return {
Expand Down Expand Up @@ -704,7 +704,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.36'

@property
def image_workdir(self):
Expand Down Expand Up @@ -794,7 +794,7 @@ def is_script(self):
return False

def command(self):
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(fixed_radiance_parameters=self.fixed_radiance_parameters, output_format=self.output_format, radiance_parameters=self.radiance_parameters, order_by=self.order_by, sensor_count=self.sensor_count, conversion=self.conversion, header=self.header)
return 'honeybee-radiance dc scoeff scene.oct grid.pts sky.dome sky.mtx --sensor-count {sensor_count} --output results.ill --rad-params "{radiance_parameters}" --rad-params-locked "{fixed_radiance_parameters}" --conversion "{conversion}" --output-format {output_format} --order-by-{order_by} --{header}-header'.format(header=self.header, sensor_count=self.sensor_count, conversion=self.conversion, order_by=self.order_by, radiance_parameters=self.radiance_parameters, output_format=self.output_format, fixed_radiance_parameters=self.fixed_radiance_parameters)

def output(self):
return {
Expand Down Expand Up @@ -836,7 +836,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.36'

@property
def image_workdir(self):
Expand Down Expand Up @@ -937,7 +937,7 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/honeybee-radiance:1.65.32'
return 'docker.io/ladybugtools/honeybee-radiance:1.65.36'

@property
def image_workdir(self):
Expand Down Expand Up @@ -1031,7 +1031,7 @@ def requires(self):
def output(self):
return {
'result_folder': luigi.LocalTarget(
pathlib.Path(self.execution_folder, 'dynamic/final/{grid}/{aperture_id}'.format(grid=self.grid, aperture_id=self.aperture_id)).resolve().as_posix()
pathlib.Path(self.execution_folder, 'dynamic/final/{grid}/{aperture_id}'.format(aperture_id=self.aperture_id, grid=self.grid)).resolve().as_posix()
)
}

Expand All @@ -1051,7 +1051,7 @@ def output_artifacts(self):
return [
{
'name': 'result-folder', 'from': 'output',
'to': pathlib.Path(self.execution_folder, 'dynamic/final/{grid}/{aperture_id}'.format(grid=self.grid, aperture_id=self.aperture_id)).resolve().as_posix(),
'to': pathlib.Path(self.execution_folder, 'dynamic/final/{grid}/{aperture_id}'.format(aperture_id=self.aperture_id, grid=self.grid)).resolve().as_posix(),
'optional': False,
'type': 'folder'
}]
Expand All @@ -1064,14 +1064,14 @@ def input_parameters(self):

@property
def task_image(self):
return 'docker.io/ladybugtools/ladybug-comfort:0.16.5'
return 'docker.io/ladybugtools/ladybug-comfort:0.16.47'

@property
def image_workdir(self):
return '/home/ladybugbot/run'


class _RadianceContribEntryPoint_147cac13Orchestrator(luigi.WrapperTask):
class _RadianceContribEntryPoint_b3d2dfdeOrchestrator(luigi.WrapperTask):
"""Runs all the tasks in this module."""
# user input for this module
_input_params = luigi.DictParameter()
Expand Down
Loading

0 comments on commit e72cc04

Please sign in to comment.