Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

reshape constraint construction #1815

Merged
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
rename method
a-zakir committed Dec 11, 2023
commit 8883a87a086f0c05844fe2ac518467612467b4ac
2 changes: 1 addition & 1 deletion src/solver/optimisation/ProblemMatrixEssential.h
Original file line number Diff line number Diff line change
@@ -43,7 +43,7 @@ class ProblemMatrixEssential
{
for (auto& group : constraintgroups_)
{
group->Build();
group->buildConstraints();
}
}

Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class AbstractStartUpCostsGroup : public ConstraintGroup
{
}

void Build() = 0;
void buildConstraints() = 0;

bool simulation_ = false;
StartUpCostsData GetStartUpCostsDataFromProblemHebdo();
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ AreaHydroLevelData AreaHydroLevelGroup::GetAreaHydroLevelData()
.CaracteristiquesHydrauliques = problemeHebdo_->CaracteristiquesHydrauliques};
}

void AreaHydroLevelGroup::Build()
void AreaHydroLevelGroup::buildConstraints()
{
auto areaHydroLevelData = GetAreaHydroLevelData();
AreaHydroLevel areaHydroLevel(builder_, areaHydroLevelData);
2 changes: 1 addition & 1 deletion src/solver/optimisation/constraints/AreaHydroLevelGroup.h
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ class AreaHydroLevelGroup : public ConstraintGroup
using ConstraintGroup::ConstraintGroup;


void Build() override;
void buildConstraints() override;

private:
AreaHydroLevelData GetAreaHydroLevelData();
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ BindingConstraintDayData BindingConstraintDayGroup::GetBindingConstraintDayDataF
.NumeroDeJourDuPasDeTemps = problemeHebdo_->NumeroDeJourDuPasDeTemps};
}

void BindingConstraintDayGroup::Build()
void BindingConstraintDayGroup::buildConstraints()
{
auto bindingConstraintDayData = GetBindingConstraintDayDataFromProblemHebdo();
BindingConstraintDay bindingConstraintDay(builder_, bindingConstraintDayData);
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ class BindingConstraintDayGroup : public ConstraintGroup
using ConstraintGroup::ConstraintGroup;


void Build() override;
void buildConstraints() override;

private:
BindingConstraintDayData GetBindingConstraintDayDataFromProblemHebdo();
Original file line number Diff line number Diff line change
@@ -10,7 +10,7 @@ BindingConstraintWeekData BindingConstraintWeekGroup::GetBindingConstraintWeekDa
.NumeroDeContrainteDesContraintesCouplantes};
}

void BindingConstraintWeekGroup::Build()
void BindingConstraintWeekGroup::buildConstraints()
{
auto bindingConstraintWeekData = GetBindingConstraintWeekDataFromProblemHebdo();
BindingConstraintWeek bindingConstraintWeek(builder_, bindingConstraintWeekData);
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ class BindingConstraintWeekGroup : public ConstraintGroup
using ConstraintGroup::ConstraintGroup;


void Build() override;
void buildConstraints() override;

private:
BindingConstraintWeekData GetBindingConstraintWeekDataFromProblemHebdo();
Original file line number Diff line number Diff line change
@@ -5,7 +5,7 @@
* @brief build ConsistenceNumberOfDispatchableUnits constraints with
* respect to default order
*/
void ConsistenceNumberOfDispatchableUnitsGroup::Build()
void ConsistenceNumberOfDispatchableUnitsGroup::buildConstraints()
{
auto data = GetStartUpCostsDataFromProblemHebdo();
ConsistenceNumberOfDispatchableUnits consistenceNumberOfDispatchableUnits(builder_, data);
Original file line number Diff line number Diff line change
@@ -12,5 +12,5 @@ class ConsistenceNumberOfDispatchableUnitsGroup : public AbstractStartUpCostsGro
public:
using AbstractStartUpCostsGroup::AbstractStartUpCostsGroup;

void Build() override;
void buildConstraints() override;
};
2 changes: 1 addition & 1 deletion src/solver/optimisation/constraints/ConstraintGroup.h
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ class ConstraintGroup
{
}

virtual void Build() = 0;
virtual void buildConstraints() = 0;
PROBLEME_HEBDO* problemeHebdo_;
ConstraintBuilder& builder_;
};
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ ExchangeBalanceData ExchangeBalanceGroup::GetExchangeBalanceDataFromProblemHebdo
.NumeroDeContrainteDeSoldeDEchange = problemeHebdo_->NumeroDeContrainteDeSoldeDEchange};
}

void ExchangeBalanceGroup::Build()
void ExchangeBalanceGroup::buildConstraints()
{
auto data = GetExchangeBalanceDataFromProblemHebdo();
ExchangeBalance exchangeBalance(builder_, data);
2 changes: 1 addition & 1 deletion src/solver/optimisation/constraints/ExchangeBalanceGroup.h
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ class ExchangeBalanceGroup : public ConstraintGroup
public:
using ConstraintGroup::ConstraintGroup;

void Build() override;
void buildConstraints() override;

private:
ExchangeBalanceData GetExchangeBalanceDataFromProblemHebdo();
2 changes: 1 addition & 1 deletion src/solver/optimisation/constraints/FinalStockGroup.cpp
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ FinalStockExpressionData FinalStockGroup::GetFinalStockExpressionData()
= problemeHebdo_->NumeroDeContrainteExpressionStockFinal};
}

void FinalStockGroup::Build()
void FinalStockGroup::buildConstraints()
{
auto finalStockEquivalentData = GetFinalStockEquivalentData();
FinalStockEquivalent finalStockEquivalent(builder_, finalStockEquivalentData);
2 changes: 1 addition & 1 deletion src/solver/optimisation/constraints/FinalStockGroup.h
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ class FinalStockGroup : public ConstraintGroup
using ConstraintGroup::ConstraintGroup;


void Build() override;
void buildConstraints() override;

private:
FinalStockEquivalentData GetFinalStockEquivalentData();
2 changes: 1 addition & 1 deletion src/solver/optimisation/constraints/Group1.cpp
Original file line number Diff line number Diff line change
@@ -42,7 +42,7 @@ BindingConstraintHourData Group1::GetBindingConstraintHourData()
.PaliersThermiquesDuPays = problemeHebdo_->PaliersThermiquesDuPays};
}

void Group1::Build()
void Group1::buildConstraints()
{
auto areaBalanceData = GetAreaBalanceData();
AreaBalance areaBalance(builder_, areaBalanceData);
2 changes: 1 addition & 1 deletion src/solver/optimisation/constraints/Group1.h
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ class Group1 : public ConstraintGroup
public:
using ConstraintGroup::ConstraintGroup;

void Build() override;
void buildConstraints() override;

private:
AreaBalanceData GetAreaBalanceData();
Original file line number Diff line number Diff line change
@@ -3,7 +3,7 @@
#include "HydroPowerSmoothingUsingVariationMaxDown.h"
#include "HydroPowerSmoothingUsingVariationMaxUp.h"

void HydraulicSmoothingGroup::Build()
void HydraulicSmoothingGroup::buildConstraints()
{
HydroPowerSmoothingUsingVariationSum hydroPowerSmoothingUsingVariationSum(builder_);
HydroPowerSmoothingUsingVariationMaxDown hydroPowerSmoothingUsingVariationMaxDown(builder_);
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@ class HydraulicSmoothingGroup : public ConstraintGroup
using ConstraintGroup::ConstraintGroup;


void Build() override;
void buildConstraints() override;

private:
};
2 changes: 1 addition & 1 deletion src/solver/optimisation/constraints/HydroPowerGroup.cpp
Original file line number Diff line number Diff line change
@@ -9,7 +9,7 @@ HydroPowerData HydroPowerGroup::GetHydroPowerDataFromProblemHebdo()
.NumeroDeContrainteEnergieHydraulique = problemeHebdo_->NumeroDeContrainteEnergieHydraulique};
}

void HydroPowerGroup::Build()
void HydroPowerGroup::buildConstraints()
{
auto hydroPowerData = GetHydroPowerDataFromProblemHebdo();
HydroPower hydroPower(builder_, hydroPowerData);
2 changes: 1 addition & 1 deletion src/solver/optimisation/constraints/HydroPowerGroup.h
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ class HydroPowerGroup : public ConstraintGroup
using ConstraintGroup::ConstraintGroup;


void Build() override;
void buildConstraints() override;

private:
HydroPowerData GetHydroPowerDataFromProblemHebdo();
2 changes: 1 addition & 1 deletion src/solver/optimisation/constraints/MaxPumpingGroup.cpp
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@ MaxPumpingData MaxPumpingGroup::GetMaxPumpingData()
.NumeroDeContrainteMaxPompage = problemeHebdo_->NumeroDeContrainteMaxPompage};
}

void MaxPumpingGroup::Build()
void MaxPumpingGroup::buildConstraints()
{
auto maxPumpingData = GetMaxPumpingData();
MaxPumping maxPumping(builder_, maxPumpingData);
2 changes: 1 addition & 1 deletion src/solver/optimisation/constraints/MaxPumpingGroup.h
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ class MaxPumpingGroup : public ConstraintGroup
using ConstraintGroup::ConstraintGroup;


void Build() override;
void buildConstraints() override;

private:
MaxPumpingData GetMaxPumpingData();
2 changes: 1 addition & 1 deletion src/solver/optimisation/constraints/MinDownTimeGroup.cpp
Original file line number Diff line number Diff line change
@@ -11,7 +11,7 @@ MinDownTimeData MinDownTimeGroup::GetMinDownTimeDataFromProblemHebdo()
* @brief build MinDownTime constraints with
* respect to default order
*/
void MinDownTimeGroup::Build()
void MinDownTimeGroup::buildConstraints()
{
auto data = GetMinDownTimeDataFromProblemHebdo();
MinDownTime minDownTime(builder_, data);
2 changes: 1 addition & 1 deletion src/solver/optimisation/constraints/MinDownTimeGroup.h
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class MinDownTimeGroup : public AbstractStartUpCostsGroup
public:
using AbstractStartUpCostsGroup::AbstractStartUpCostsGroup;

void Build() override;
void buildConstraints() override;

private:
MinDownTimeData GetMinDownTimeDataFromProblemHebdo();
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ MaxHydroPowerData MinMaxHydroPowerGroup::GetMaxHydroPowerData()
= problemeHebdo_->NumeroDeContrainteMaxEnergieHydraulique};
}

void MinMaxHydroPowerGroup::Build()
void MinMaxHydroPowerGroup::buildConstraints()
{
auto minHydroPowerData = GetMinHydroPowerData();
MinHydroPower minHydroPower(builder_, minHydroPowerData);
Original file line number Diff line number Diff line change
@@ -8,7 +8,7 @@ class MinMaxHydroPowerGroup : public ConstraintGroup
public:
using ConstraintGroup::ConstraintGroup;

void Build() override;
void buildConstraints() override;

private:
MinHydroPowerData GetMinHydroPowerData();
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ NbDispUnitsMinBoundSinceMinUpTimeData
* @brief build NbUnitsOutageLessThanNbUnitsStopGroup constraints with
* respect to default order
*/
void NbDispUnitsMinBoundSinceMinUpTimeGroup::Build()
void NbDispUnitsMinBoundSinceMinUpTimeGroup::buildConstraints()
{
auto data = GetNbDispUnitsMinBoundSinceMinUpTimeDataFromProblemHebdo();
NbDispUnitsMinBoundSinceMinUpTime nbDispUnitsMinBoundSinceMinUpTime(builder_, data);
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class NbDispUnitsMinBoundSinceMinUpTimeGroup : public AbstractStartUpCostsGroup
public:
using AbstractStartUpCostsGroup::AbstractStartUpCostsGroup;

void Build() override;
void buildConstraints() override;

private:
NbDispUnitsMinBoundSinceMinUpTimeData
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@ NbUnitsOutageLessThanNbUnitsStopData
* @brief build NbUnitsOutageLessThanNbUnitsStopGroup constraints with
* respect to default order
*/
void NbUnitsOutageLessThanNbUnitsStopGroup::Build()
void NbUnitsOutageLessThanNbUnitsStopGroup::buildConstraints()
{
auto data = GetNbUnitsOutageLessThanNbUnitsStopDataFromProblemHebdo();
NbUnitsOutageLessThanNbUnitsStop nbUnitsOutageLessThanNbUnitsStop(builder_, data);
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ class NbUnitsOutageLessThanNbUnitsStopGroup : public AbstractStartUpCostsGroup
public:
using AbstractStartUpCostsGroup::AbstractStartUpCostsGroup;

void Build() override;
void buildConstraints() override;

private:
NbUnitsOutageLessThanNbUnitsStopData GetNbUnitsOutageLessThanNbUnitsStopDataFromProblemHebdo();
Original file line number Diff line number Diff line change
@@ -4,7 +4,7 @@
* @brief build P{min,max}DispatchableGeneration constraints with
* respect to default order
*/
void PMinMaxDispatchableGenerationGroup::Build()
void PMinMaxDispatchableGenerationGroup::buildConstraints()
{
auto data = GetStartUpCostsDataFromProblemHebdo();
PMaxDispatchableGeneration pMaxDispatchableGeneration(builder_, data);
Original file line number Diff line number Diff line change
@@ -13,5 +13,5 @@ class PMinMaxDispatchableGenerationGroup : public AbstractStartUpCostsGroup
public:
using AbstractStartUpCostsGroup::AbstractStartUpCostsGroup;

void Build() override;
void buildConstraints() override;
};