@@ -113,27 +113,28 @@ def _generic_metrics(
113
113
** kwargs ,
114
114
):
115
115
base_metrics = super ()._generic_metrics (npv , metric_name , metric_meth , ** kwargs )
116
- base_metrics = self ._calc_averted (base_metrics )
117
- no_measures = base_metrics [base_metrics ["measure" ] == "no_measure" ].copy ()
118
- no_measures ["reference risk" ] = no_measures ["risk" ]
119
- no_measures ["averted risk" ] = 0.0
120
- no_measures ["measure net cost" ] = 0.0
121
- no_measures ["measure cost benefit" ] = 0.0
122
- cash_flow_metrics = self ._calc_per_measure_annual_cash_flows ()
123
- base_metrics = base_metrics .merge (
124
- cash_flow_metrics [["date" , "measure" , "measure net cost" ]],
125
- on = ["measure" , "date" ],
126
- )
127
- base_metrics = pd .concat ([no_measures , base_metrics ])
116
+ if base_metrics is not None :
117
+ base_metrics = self ._calc_averted (base_metrics )
118
+ no_measures = base_metrics [base_metrics ["measure" ] == "no_measure" ].copy ()
119
+ no_measures ["reference risk" ] = no_measures ["risk" ]
120
+ no_measures ["averted risk" ] = 0.0
121
+ no_measures ["measure net cost" ] = 0.0
122
+ no_measures ["measure cost benefit" ] = 0.0
123
+ cash_flow_metrics = self ._calc_per_measure_annual_cash_flows ()
124
+ base_metrics = base_metrics .merge (
125
+ cash_flow_metrics [["date" , "measure" , "measure net cost" ]],
126
+ on = ["measure" , "date" ],
127
+ )
128
+ base_metrics = pd .concat ([no_measures , base_metrics ])
128
129
129
- averted_risk = base_metrics ["averted risk" ]
130
- cash_flow_metrics = base_metrics ["measure net cost" ]
131
- base_metrics ["measure cost benefit" ] = averted_risk - cash_flow_metrics
130
+ averted_risk = base_metrics ["averted risk" ]
131
+ cash_flow_metrics = base_metrics ["measure net cost" ]
132
+ base_metrics ["measure cost benefit" ] = averted_risk - cash_flow_metrics
132
133
133
- if measures is not None :
134
- base_metrics = base_metrics .loc [
135
- base_metrics ["measure" ].isin (measures )
136
- ].reset_index ()
134
+ if measures is not None :
135
+ base_metrics = base_metrics .loc [
136
+ base_metrics ["measure" ].isin (measures )
137
+ ].reset_index ()
137
138
138
139
return base_metrics
139
140
0 commit comments