Skip to content

Commit

Permalink
Code smells
Browse files Browse the repository at this point in the history
  • Loading branch information
flomnes committed Dec 10, 2024
1 parent 1ebb670 commit 2ac26ae
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -67,6 +67,7 @@ enum class LocalTSGenerationBehavior
class CostProvider
{
public:
virtual ~CostProvider() = default;
virtual double getOperatingCost(uint serieIndex, uint hourInTheYear) const = 0;
virtual double getMarginalCost(uint serieIndex, uint hourInTheYear) const = 0;
virtual double getMarketBidCost(uint hourInTheYear, uint year) const = 0;
Expand All @@ -77,7 +78,8 @@ class ThermalCluster;
class ConstantCostProvider: public CostProvider
{
public:
ConstantCostProvider(const ThermalCluster& cluster);
explicit ConstantCostProvider(const ThermalCluster& cluster);
virtual ~ConstantCostProvider() = default;
double getOperatingCost(uint serieIndex, uint hourInTheYear) const override;
double getMarginalCost(uint serieIndex, uint hourInTheYear) const override;
double getMarketBidCost(uint hourInTheYear, uint year) const override;
Expand All @@ -89,7 +91,8 @@ class ConstantCostProvider: public CostProvider
class ScenarizedCostProvider: public CostProvider
{
public:
ScenarizedCostProvider(const ThermalCluster& cluster);
explicit ScenarizedCostProvider(const ThermalCluster& cluster);
virtual ~ScenarizedCostProvider() = default;
double getOperatingCost(uint serieIndex, uint hourInTheYear) const override;
double getMarginalCost(uint serieIndex, uint hourInTheYear) const override;
double getMarketBidCost(uint hourInTheYear, uint year) const override;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -109,22 +109,22 @@ void ScenarizedCostProvider::ComputeMarketBidTS()

double ScenarizedCostProvider::getOperatingCost(uint serieIndex, uint hourInTheYear) const
{
const uint tsIndex = std::min(serieIndex, (uint)costsTimeSeries.size() - 1);
const uint tsIndex = std::min(serieIndex, static_cast<uint>(costsTimeSeries.size()) - 1);
return costsTimeSeries[tsIndex].productionCostTs[hourInTheYear];
}

double ScenarizedCostProvider::getMarginalCost(uint serieIndex, uint hourInTheYear) const
{
const double mod = cluster.modulation[thermalModulationMarketBid][hourInTheYear];
const uint tsIndex = std::min(serieIndex, (uint)costsTimeSeries.size() - 1);
const uint tsIndex = std::min(serieIndex, static_cast<uint>(costsTimeSeries.size()) - 1);
return costsTimeSeries[tsIndex].marginalCostTS[hourInTheYear] * mod;
}

double ScenarizedCostProvider::getMarketBidCost(uint hourInTheYear, uint year) const
{
const double mod = cluster.modulation[thermalModulationMarketBid][hourInTheYear];
const uint serieIndex = cluster.series.getSeriesIndex(year);
const uint tsIndex = std::min(serieIndex, (uint)costsTimeSeries.size() - 1);
const uint tsIndex = std::min(serieIndex, static_cast<uint>(costsTimeSeries.size()) - 1);
return costsTimeSeries[tsIndex].marketBidCostTS[hourInTheYear] * mod;
}

Expand Down

0 comments on commit 2ac26ae

Please sign in to comment.