Skip to content

Commit dead41d

Browse files
committed
applied 'ruff format' command to the whole directory tree
1 parent 8f64ce9 commit dead41d

File tree

161 files changed

+25043
-15692
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

161 files changed

+25043
-15692
lines changed

benchmarks/benchmarks/detect_clearsky.py

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -9,22 +9,22 @@
99

1010
class DetectClear:
1111
params = [1, 10, 100] # number of days
12-
param_names = ['ndays']
12+
param_names = ["ndays"]
1313

1414
def setup(self, ndays):
15-
self.times = pd.date_range(start='20180601', freq='1min',
16-
periods=1440*ndays)
15+
self.times = pd.date_range(start="20180601", freq="1min", periods=1440 * ndays)
1716
self.lat = 35.1
1817
self.lon = -106.6
1918
self.solar_position = solarposition.get_solarposition(
20-
self.times, self.lat, self.lon)
19+
self.times, self.lat, self.lon
20+
)
2121
clearsky_df = clearsky.simplified_solis(
22-
self.solar_position['apparent_elevation'])
23-
self.clearsky = clearsky_df['ghi']
24-
measured_dni = clearsky_df['dni'].where(
25-
(self.times.hour % 2).astype(bool), 0)
26-
cos_zen = np.cos(np.deg2rad(self.solar_position['apparent_zenith']))
27-
self.measured = measured_dni * cos_zen + clearsky_df['dhi']
22+
self.solar_position["apparent_elevation"]
23+
)
24+
self.clearsky = clearsky_df["ghi"]
25+
measured_dni = clearsky_df["dni"].where((self.times.hour % 2).astype(bool), 0)
26+
cos_zen = np.cos(np.deg2rad(self.solar_position["apparent_zenith"]))
27+
self.measured = measured_dni * cos_zen + clearsky_df["dhi"]
2828
self.measured *= 0.98
2929
self.window_length = 10
3030

benchmarks/benchmarks/infinite_sheds.py

Lines changed: 31 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -9,14 +9,12 @@
99

1010

1111
class InfiniteSheds:
12-
1312
# benchmark variant parameters (run both vectorize=True and False)
1413
params = [True, False]
15-
param_names = ['vectorize']
14+
param_names = ["vectorize"]
1615

1716
def setup(self, vectorize):
18-
self.times = pd.date_range(start='20180601', freq='1min',
19-
periods=1440)
17+
self.times = pd.date_range(start="20180601", freq="1min", periods=1440)
2018
self.location = location.Location(40, -80)
2119
self.solar_position = self.location.get_solarposition(self.times)
2220
self.clearsky_irradiance = self.location.get_clearsky(
@@ -27,50 +25,50 @@ def setup(self, vectorize):
2725
self.surface_azimuth = 180
2826
self.gcr = 0.35
2927
self.height = 2.5
30-
self.pitch = 5.
28+
self.pitch = 5.0
3129
self.albedo = 0.2
3230
self.npoints = 100
3331

34-
with np.errstate(invalid='ignore'):
32+
with np.errstate(invalid="ignore"):
3533
self.tracking = tracking.singleaxis(
36-
self.solar_position['apparent_zenith'],
37-
self.solar_position['azimuth'],
34+
self.solar_position["apparent_zenith"],
35+
self.solar_position["azimuth"],
3836
axis_tilt=0,
3937
axis_azimuth=0,
4038
max_angle=60,
4139
backtrack=True,
42-
gcr=self.gcr
40+
gcr=self.gcr,
4341
)
4442

4543
def time_get_irradiance_poa_fixed(self, vectorize):
4644
infinite_sheds.get_irradiance_poa(
4745
surface_tilt=self.surface_tilt,
4846
surface_azimuth=self.surface_azimuth,
49-
solar_zenith=self.solar_position['apparent_zenith'],
50-
solar_azimuth=self.solar_position['azimuth'],
47+
solar_zenith=self.solar_position["apparent_zenith"],
48+
solar_azimuth=self.solar_position["azimuth"],
5149
gcr=self.gcr,
5250
height=self.height,
5351
pitch=self.pitch,
54-
ghi=self.clearsky_irradiance['ghi'],
55-
dhi=self.clearsky_irradiance['dhi'],
56-
dni=self.clearsky_irradiance['dni'],
52+
ghi=self.clearsky_irradiance["ghi"],
53+
dhi=self.clearsky_irradiance["dhi"],
54+
dni=self.clearsky_irradiance["dni"],
5755
albedo=self.albedo,
5856
npoints=self.npoints,
5957
vectorize=vectorize,
6058
)
6159

6260
def time_get_irradiance_poa_tracking(self, vectorize):
6361
infinite_sheds.get_irradiance_poa(
64-
surface_tilt=self.tracking['surface_tilt'],
65-
surface_azimuth=self.tracking['surface_azimuth'],
66-
solar_zenith=self.solar_position['apparent_zenith'],
67-
solar_azimuth=self.solar_position['azimuth'],
62+
surface_tilt=self.tracking["surface_tilt"],
63+
surface_azimuth=self.tracking["surface_azimuth"],
64+
solar_zenith=self.solar_position["apparent_zenith"],
65+
solar_azimuth=self.solar_position["azimuth"],
6866
gcr=self.gcr,
6967
height=self.height,
7068
pitch=self.pitch,
71-
ghi=self.clearsky_irradiance['ghi'],
72-
dhi=self.clearsky_irradiance['dhi'],
73-
dni=self.clearsky_irradiance['dni'],
69+
ghi=self.clearsky_irradiance["ghi"],
70+
dhi=self.clearsky_irradiance["dhi"],
71+
dni=self.clearsky_irradiance["dni"],
7472
albedo=self.albedo,
7573
npoints=self.npoints,
7674
vectorize=vectorize,
@@ -80,31 +78,31 @@ def time_get_irradiance_fixed(self, vectorize):
8078
infinite_sheds.get_irradiance(
8179
surface_tilt=self.surface_tilt,
8280
surface_azimuth=self.surface_azimuth,
83-
solar_zenith=self.solar_position['apparent_zenith'],
84-
solar_azimuth=self.solar_position['azimuth'],
81+
solar_zenith=self.solar_position["apparent_zenith"],
82+
solar_azimuth=self.solar_position["azimuth"],
8583
gcr=self.gcr,
8684
height=self.height,
8785
pitch=self.pitch,
88-
ghi=self.clearsky_irradiance['ghi'],
89-
dhi=self.clearsky_irradiance['dhi'],
90-
dni=self.clearsky_irradiance['dni'],
86+
ghi=self.clearsky_irradiance["ghi"],
87+
dhi=self.clearsky_irradiance["dhi"],
88+
dni=self.clearsky_irradiance["dni"],
9189
albedo=self.albedo,
9290
npoints=self.npoints,
9391
vectorize=vectorize,
9492
)
9593

9694
def time_get_irradiance_tracking(self, vectorize):
9795
infinite_sheds.get_irradiance(
98-
surface_tilt=self.tracking['surface_tilt'],
99-
surface_azimuth=self.tracking['surface_azimuth'],
100-
solar_zenith=self.solar_position['apparent_zenith'],
101-
solar_azimuth=self.solar_position['azimuth'],
96+
surface_tilt=self.tracking["surface_tilt"],
97+
surface_azimuth=self.tracking["surface_azimuth"],
98+
solar_zenith=self.solar_position["apparent_zenith"],
99+
solar_azimuth=self.solar_position["azimuth"],
102100
gcr=self.gcr,
103101
height=self.height,
104102
pitch=self.pitch,
105-
ghi=self.clearsky_irradiance['ghi'],
106-
dhi=self.clearsky_irradiance['dhi'],
107-
dni=self.clearsky_irradiance['dni'],
103+
ghi=self.clearsky_irradiance["ghi"],
104+
dhi=self.clearsky_irradiance["dhi"],
105+
dni=self.clearsky_irradiance["dni"],
108106
albedo=self.albedo,
109107
npoints=self.npoints,
110108
vectorize=vectorize,

benchmarks/benchmarks/irradiance.py

Lines changed: 51 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -7,62 +7,80 @@
77

88

99
class Irradiance:
10-
1110
def setup(self):
12-
self.times = pd.date_range(start='20180601', freq='1min',
13-
periods=14400)
14-
self.days = pd.date_range(start='20180601', freq='d', periods=30)
11+
self.times = pd.date_range(start="20180601", freq="1min", periods=14400)
12+
self.days = pd.date_range(start="20180601", freq="d", periods=30)
1513
self.location = location.Location(40, -80)
1614
self.solar_position = self.location.get_solarposition(self.times)
1715
self.clearsky_irradiance = self.location.get_clearsky(self.times)
1816
self.tilt = 20
1917
self.azimuth = 180
20-
self.aoi = irradiance.aoi(self.tilt, self.azimuth,
21-
self.solar_position.apparent_zenith,
22-
self.solar_position.azimuth)
18+
self.aoi = irradiance.aoi(
19+
self.tilt,
20+
self.azimuth,
21+
self.solar_position.apparent_zenith,
22+
self.solar_position.azimuth,
23+
)
2324

2425
def time_get_extra_radiation(self):
2526
irradiance.get_extra_radiation(self.days)
2627

2728
def time_aoi(self):
28-
irradiance.aoi(self.tilt, self.azimuth,
29-
self.solar_position.apparent_zenith,
30-
self.solar_position.azimuth)
29+
irradiance.aoi(
30+
self.tilt,
31+
self.azimuth,
32+
self.solar_position.apparent_zenith,
33+
self.solar_position.azimuth,
34+
)
3135

3236
def time_aoi_projection(self):
33-
irradiance.aoi_projection(self.tilt, self.azimuth,
34-
self.solar_position.apparent_zenith,
35-
self.solar_position.azimuth)
37+
irradiance.aoi_projection(
38+
self.tilt,
39+
self.azimuth,
40+
self.solar_position.apparent_zenith,
41+
self.solar_position.azimuth,
42+
)
3643

3744
def time_get_ground_diffuse(self):
3845
irradiance.get_ground_diffuse(self.tilt, self.clearsky_irradiance.ghi)
3946

4047
def time_get_total_irradiance(self):
41-
irradiance.get_total_irradiance(self.tilt, self.azimuth,
42-
self.solar_position.apparent_zenith,
43-
self.solar_position.azimuth,
44-
self.clearsky_irradiance.dni,
45-
self.clearsky_irradiance.ghi,
46-
self.clearsky_irradiance.dhi)
48+
irradiance.get_total_irradiance(
49+
self.tilt,
50+
self.azimuth,
51+
self.solar_position.apparent_zenith,
52+
self.solar_position.azimuth,
53+
self.clearsky_irradiance.dni,
54+
self.clearsky_irradiance.ghi,
55+
self.clearsky_irradiance.dhi,
56+
)
4757

4858
def time_disc(self):
49-
irradiance.disc(self.clearsky_irradiance.ghi,
50-
self.solar_position.apparent_zenith,
51-
self.times)
59+
irradiance.disc(
60+
self.clearsky_irradiance.ghi,
61+
self.solar_position.apparent_zenith,
62+
self.times,
63+
)
5264

5365
def time_dirint(self):
54-
irradiance.dirint(self.clearsky_irradiance.ghi,
55-
self.solar_position.apparent_zenith,
56-
self.times)
66+
irradiance.dirint(
67+
self.clearsky_irradiance.ghi,
68+
self.solar_position.apparent_zenith,
69+
self.times,
70+
)
5771

5872
def time_dirindex(self):
59-
irradiance.dirindex(self.clearsky_irradiance.ghi,
60-
self.clearsky_irradiance.ghi,
61-
self.clearsky_irradiance.dni,
62-
self.solar_position.apparent_zenith,
63-
self.times)
73+
irradiance.dirindex(
74+
self.clearsky_irradiance.ghi,
75+
self.clearsky_irradiance.ghi,
76+
self.clearsky_irradiance.dni,
77+
self.solar_position.apparent_zenith,
78+
self.times,
79+
)
6480

6581
def time_erbs(self):
66-
irradiance.erbs(self.clearsky_irradiance.ghi,
67-
self.solar_position.apparent_zenith,
68-
self.times)
82+
irradiance.erbs(
83+
self.clearsky_irradiance.ghi,
84+
self.solar_position.apparent_zenith,
85+
self.times,
86+
)

benchmarks/benchmarks/location.py

Lines changed: 9 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -8,17 +8,15 @@
88

99

1010
def set_solar_position(obj):
11-
obj.location = pvlib.location.Location(32, -110, altitude=700,
12-
tz='Etc/GMT+7')
13-
obj.times = pd.date_range(start='20180601', freq='3min',
14-
periods=1440)
15-
obj.days = pd.date_range(start='20180101', freq='d', periods=365,
16-
tz=obj.location.tz)
11+
obj.location = pvlib.location.Location(32, -110, altitude=700, tz="Etc/GMT+7")
12+
obj.times = pd.date_range(start="20180601", freq="3min", periods=1440)
13+
obj.days = pd.date_range(
14+
start="20180101", freq="d", periods=365, tz=obj.location.tz
15+
)
1716
obj.solar_position = obj.location.get_solarposition(obj.times)
1817

1918

2019
class Location:
21-
2220
def setup(self):
2321
set_solar_position(self)
2422

@@ -30,22 +28,18 @@ def time_location_get_solarposition(self):
3028
self.location.get_solarposition(times=self.times)
3129

3230
def time_location_get_clearsky(self):
33-
self.location.get_clearsky(times=self.times,
34-
solar_position=self.solar_position)
31+
self.location.get_clearsky(times=self.times, solar_position=self.solar_position)
3532

3633

3734
class Location_0_6_1:
38-
3935
def setup(self):
40-
if Version(pvlib.__version__) < Version('0.6.1'):
36+
if Version(pvlib.__version__) < Version("0.6.1"):
4137
raise NotImplementedError
4238

4339
set_solar_position(self)
4440

4541
def time_location_get_sun_rise_set_transit_pyephem(self):
46-
self.location.get_sun_rise_set_transit(times=self.days,
47-
method='pyephem')
42+
self.location.get_sun_rise_set_transit(times=self.days, method="pyephem")
4843

4944
def time_location_get_sun_rise_set_transit_spa(self):
50-
self.location.get_sun_rise_set_transit(times=self.days,
51-
method='spa')
45+
self.location.get_sun_rise_set_transit(times=self.days, method="spa")

benchmarks/benchmarks/scaling.py

Lines changed: 7 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -8,20 +8,18 @@
88

99

1010
class Scaling:
11-
1211
def setup(self):
1312
self.n = 1000
1413
lat = np.array((9.99, 10, 10.01))
1514
lon = np.array((4.99, 5, 5.01))
16-
self.coordinates = np.array([(lati, loni) for
17-
(lati, loni) in zip(lat, lon)])
18-
self.times = pd.date_range('2019-01-01', freq='1T', periods=self.n)
15+
self.coordinates = np.array([(lati, loni) for (lati, loni) in zip(lat, lon)])
16+
self.times = pd.date_range("2019-01-01", freq="1T", periods=self.n)
1917
self.positions = np.array([[0, 0], [100, 0], [100, 100], [0, 100]])
20-
self.clearsky_index = pd.Series(np.random.rand(self.n),
21-
index=self.times)
18+
self.clearsky_index = pd.Series(np.random.rand(self.n), index=self.times)
2219
self.cloud_speed = 5
23-
self.tmscales = np.array((1, 2, 4, 8, 16, 32, 64,
24-
128, 256, 512, 1024, 2048, 4096))
20+
self.tmscales = np.array(
21+
(1, 2, 4, 8, 16, 32, 64, 128, 256, 512, 1024, 2048, 4096)
22+
)
2523

2624
def time_latlon_to_xy(self):
2725
scaling.latlon_to_xy(self.coordinates)
@@ -33,5 +31,4 @@ def time__compute_vr(self):
3331
scaling._compute_vr(self.positions, self.cloud_speed, self.tmscales)
3432

3533
def time_wvm(self):
36-
scaling.wvm(self.clearsky_index, self.positions,
37-
self.cloud_speed, dt=1)
34+
scaling.wvm(self.clearsky_index, self.positions, self.cloud_speed, dt=1)

0 commit comments

Comments
 (0)