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
ModelChainResult.__repr__ #1236
Changes from 1 commit
edf3b53
0551447
2b52088
068c72b
df268d0
db68853
3b005a2
0963ca9
db1a33d
7f66f43
ce3b77b
dde8221
File filter
Filter by extension
Conversations
Jump to
Diff view
Diff view
There are no files selected for viewing
Original file line number | Diff line number | Diff line change | ||||
---|---|---|---|---|---|---|
|
@@ -413,19 +413,15 @@ | |||||
super().__setattr__(key, value) | ||||||
|
||||||
def __repr__(self): | ||||||
# once per MC | ||||||
mc_attrs = ['weather', 'solar_position', 'airmass', 'tracking', 'aoi', | ||||||
'aoi_modifier', 'total_irrad', 'spectral_modifier', | ||||||
'effective_irradiance', 'cell_temperature', 'diode_params', | ||||||
'dc', 'dc_ohmic_losses', 'losses', 'ac'] | ||||||
mc_attrs = dir(self) | ||||||
|
||||||
def _head(obj): | ||||||
try: | ||||||
return obj[:3] | ||||||
except: | ||||||
return obj | ||||||
|
||||||
if type(self.dc) is tuple: | ||||||
num_arrays = len(self.dc) | ||||||
else: | ||||||
num_arrays = 1 | ||||||
|
@@ -433,12 +429,12 @@ | |||||
desc1 = ('=== ModelChainResult === \n') | ||||||
desc2 = (f'Number of Arrays: {num_arrays} \n') | ||||||
attr = 'times' | ||||||
desc3 = ('Times (first 3)\n' + | ||||||
desc3 = ('times (first 3)\n' + | ||||||
f'{_head(_getmcattr(self, attr))}' + | ||||||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more.
Suggested change
Seems like this should be fine as long as it's safe to assume There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Won't work if |
||||||
'\n') | ||||||
lines = [] | ||||||
for attr in mc_attrs: | ||||||
if hasattr(self, attr): | ||||||
if not (attr.startswith('_') or attr=='times'): | ||||||
lines.append(f' {attr}: ' + _mcr_repr(getattr(self, attr))) | ||||||
desc4 = '\n'.join(lines) | ||||||
return (desc1 + desc2 + desc3 + desc4) | ||||||
|
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -2063,3 +2063,40 @@ def test__irrad_for_celltemp(): | |
assert len(poa) == 2 | ||
assert_series_equal(poa[0], effect_irrad) | ||
assert_series_equal(poa[1], effect_irrad) | ||
|
||
|
||
@pytest.mark.parametrize('strategy, strategy_str', [ | ||
('south_at_latitude_tilt', 'south_at_latitude_tilt'), | ||
(None, 'None')]) # GitHub issue 352 | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Thanks for putting this test back. I think this decorator is no longer needed and can be deleted. |
||
def test_ModelChain___repr__(sapm_dc_snl_ac_system, location, strategy, | ||
strategy_str): | ||
|
||
mc = ModelChain(sapm_dc_snl_ac_system, location, | ||
name='my mc') | ||
|
||
expected = '\n'.join([ | ||
'ModelChain: ', | ||
' name: my mc', | ||
' clearsky_model: ineichen', | ||
' transposition_model: haydavies', | ||
' solar_position_method: nrel_numpy', | ||
' airmass_model: kastenyoung1989', | ||
' dc_model: sapm', | ||
' ac_model: sandia_inverter', | ||
' aoi_model: sapm_aoi_loss', | ||
' spectral_model: sapm_spectral_loss', | ||
' temperature_model: sapm_temp', | ||
' losses_model: no_extra_losses' | ||
]) | ||
|
||
assert mc.__repr__() == expected | ||
|
||
|
||
def test_ModelChainResult___repr__(sapm_dc_snl_ac_system, location, weather): | ||
mc = ModelChain(sapm_dc_snl_ac_system, location) | ||
mc.run_model(weather) | ||
mcres = mc.results.__repr__() | ||
mc_attrs = dir(mc.results) | ||
mc_attrs = [a for a in mc_attrs if not a.startswith('_')] | ||
assert all([a in mcres for a in mc_attrs]) | ||
|
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Using
dir
sorts the list of attributes alphabetically instead of conceptually. Not necessarily a downside.There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Yeah, once I saw the alphabetized list my thought was "that's easier to use"