@@ -302,20 +302,33 @@ def test_spectral_factor_jrc_supplied_ambiguous():
302302 with pytest .raises (ValueError , match = 'No valid input provided' ):
303303 spectrum .spectral_factor_jrc (1.0 , 0.8 , module_type = None ,
304304 coefficients = None )
305+
306+
305307@pytest .mark .parametrize ("module_type,expected" , [
306- ('cdte' , np .array ([0.991926 , 0.999809 , 1.01108 , 0.993319 , 0.956621 , 0.970872 ])),
307- ('monosi' , np .array ([1.00174 , 0.971769 , 0.986224 , 1.01661 , 1.02026 , 1.0106 ])),
308- ('cigs' , np .array ([1.00769 , 0.959666 , 0.974438 , 1.02861 , 1.05203 , 1.03117 ])),
309- ('asi' , np .array ([0.982133 , 1.04674 , 1.04859 , 0.951109 , 0.865328 , 0.919515 ])),
308+ ('cdte' ,
309+ np .array ([0.991926 , 0.999809 , 1.01108 , 0.993319 , 0.956621 , 0.970872 ])),
310+ ('monosi' ,
311+ np .array ([1.00174 , 0.971769 , 0.986224 , 1.01661 , 1.02026 , 1.0106 ])),
312+ ('cigs' ,
313+ np .array ([1.00769 , 0.959666 , 0.974438 , 1.02861 , 1.05203 , 1.03117 ])),
314+ ('asi' ,
315+ np .array ([0.982133 , 1.04674 , 1.04859 , 0.951109 , 0.865328 , 0.919515 ])),
310316])
311317def test_spectral_factor_polo (module_type , expected ):
312318 altitude = 500
319+ < << << << HEAD
320+ == == == =
321+
322+ >> >> >> > 1 eb3293197a61fcce506d6db08cd3657321f85c5
313323 pws = np .array ([0.96 , 0.96 , 1.85 , 1.88 , 0.66 , 0.66 ])
314324 aods = np .array ([0.085 , 0.085 , 0.16 , 0.19 , 0.088 , 0.088 ])
315325 ams = np .array ([1.34 , 1.34 , 2.2 , 2.2 , 2.6 , 2.6 ])
316326 aois = np .array ([46.0 , 76.0 , 74.0 , 28.0 , 24.0 , 55.0 ])
317327 alb = np .array ([0.15 , 0.2 , 0.3 , 0.18 , 0.32 , 0.26 ])
328+ < << << << HEAD
329+ == == == =
330+
331+ >> >> >> > 1 eb3293197a61fcce506d6db08cd3657321f85c5
318332 out = spectrum .spectral_factor_polo (
319- pws ,ams ,aods ,aois ,altitude ,module_type = module_type ,albedo = alb )
333+ pws , ams , aods , aois , altitude , module_type = module_type , albedo = alb )
320334 assert np .allclose (expected , out , atol = 1e-8 )
321-
0 commit comments