Closed zz-hh-aa closed 1 week ago
@zz-hh-aa is attempting to deploy a commit to the Open Systems Lab's projects team on Vercel, but is not a member of this team. To resolve this issue, you can:
To read more about collaboration on Vercel, click here.
Thanks @gabrielegranello! I guess there's an open question about how we want to document sources--does it make sense to put links in the README instead of in the code? I think comments might get messy with a bunch of URLs stuck in. Maybe this is something we can talk about this Friday!
Made a mess of this in the rebase / merge conflict fixing; since we have new data soon and needed to replace the math anyway, I'm just going to close this PR.
What does this PR do?
gasBillAdjustedYearly
andgasBillRetrofitYearly
to theHousehold
classHousehold
constructor, and also have their own calculation functionscalculateGasBillAdjustedYearly
andcalculateGasBillRetrofitYearly
Lifetime
class to includegasBillAdjustedYearly
andgasBillRetrofitYearly
, inflating their values year on yearinterface LifetimeParams
is updated, as isinterface LifetimeData
and thecalculateLifetime
function itselfgasBillAdjustedYearly
toLifetimeMarketPurchaseWrapper
andLifetimeMarketRentWrapper
gasBillRetrofitYearly
toLifetimeFairholdLandPurchaseWrapper
andLifetimeFairholdLandRentWrapper
Why?
gasBillYearly
value we were getting was one static figure for the average house, assuming heating demand of 13,600 kwh. Since the calculator needs to be able to account for different house sizes, types and insulation, one value wasn't sufficient.gasBillAdjustedYearly
takes the price per kwh and uses thegasBillAverageYearly
(retried from database),property.size
andproperty.houseType
to estimate a more accurate version of bills for the existing propertygasBillRetrofitYearly
does the same but with lower kwh demands per m2Closes #26