1
1
import pandas as pd
2
2
from datetime import datetime
3
- from pvlib .bifacial import pvfactors_timeseries , build , merge
3
+ from pvlib .bifacial import pvfactors_timeseries , PVFactorsReportBuilder
4
4
from conftest import requires_pvfactors
5
5
import pytest
6
6
@@ -116,7 +116,7 @@ def test_build_1():
116
116
report = None
117
117
pvarray = None
118
118
expected = {'total_inc_back' : [], 'total_inc_front' : []}
119
- assert expected == build (report , pvarray )
119
+ assert expected == PVFactorsReportBuilder . build (report , pvarray )
120
120
121
121
122
122
def test_merge_1 ():
@@ -125,7 +125,7 @@ def test_merge_1():
125
125
"""
126
126
test_dict = {'total_inc_back' : [1 , 2 , 3 ], 'total_inc_front' : [4 , 5 , 6 ]}
127
127
reports = [test_dict ]
128
- assert test_dict == merge (reports )
128
+ assert test_dict == PVFactorsReportBuilder . merge (reports )
129
129
130
130
131
131
def test_merge_2 ():
@@ -135,7 +135,7 @@ def test_merge_2():
135
135
test_dict_2 = {'total_inc_back' : [3 ], 'total_inc_front' : [6 ]}
136
136
expected = {'total_inc_back' : [1 , 2 , 3 ], 'total_inc_front' : [4 , 5 , 6 ]}
137
137
reports = [test_dict_1 , test_dict_2 ]
138
- assert expected == merge (reports )
138
+ assert expected == PVFactorsReportBuilder . merge (reports )
139
139
140
140
141
141
def test_merge_3 ():
@@ -146,4 +146,4 @@ def test_merge_3():
146
146
test_dict_3 = {'total_inc_back' : [3 ], 'total_inc_front' : [6 ]}
147
147
expected = {'total_inc_back' : [1 , 2 , 3 ], 'total_inc_front' : [4 , 5 , 6 ]}
148
148
reports = [test_dict_1 , test_dict_2 , test_dict_3 ]
149
- assert expected == merge (reports )
149
+ assert expected == PVFactorsReportBuilder . merge (reports )
0 commit comments