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.

Sign up for GitHub

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

Fix/test 50 windows #1680

Merged
merged 4 commits into from
Oct 5, 2023
Merged

Fix/test 50 windows #1680

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4ffd24f
try fix
a-zakir Oct 5, 2023
29fe61a
first test long test 2
a-zakir Oct 5, 2023
d3dd1cc
move implementation details
a-zakir Oct 5, 2023
49307ee
restore .yml
a-zakir Oct 5, 2023
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
14 changes: 7 additions & 7 deletions .github/workflows/windows-vcpkg.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,6 +153,13 @@ jobs:
path: 'simtest.json'
prop_path: 'version'

- name: Run long-tests-2
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
batch-name: long-tests-2
os: ${{ matrix.test-platform }}

- name: Run named mps tests
uses: ./.github/workflows/run-tests
with:
Expand Down Expand Up @@ -212,13 +219,6 @@ jobs:
batch-name: long-tests-1
os: ${{ matrix.test-platform }}

- name: Run long-tests-2
if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
uses: ./.github/workflows/run-tests
with:
simtest-tag: ${{steps.simtest-version.outputs.prop}}
batch-name: long-tests-2
os: ${{ matrix.test-platform }}

- name: Run long-tests-3
if: ${{ env.RUN_EXTENDED_TESTS == 'true' }}
Expand Down
2 changes: 1 addition & 1 deletion src/solver/optimisation/constraints/ConsistenceNumberOfDispatchableUnits.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ void ConsistenceNumberOfDispatchableUnits::add(int pays,
}
else
{
nbTermesContraintesPourLesCoutsDeDemarrage += 4;
problemeHebdo->NbTermesContraintesPourLesCoutsDeDemarrage += 4;
problemeHebdo->ProblemeAResoudre->NombreDeContraintes++;
}
}
1 change: 0 additions & 1 deletion src/solver/optimisation/constraints/ConsistenceNumberOfDispatchableUnits.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@ class ConsistenceNumberOfDispatchableUnits : private ConstraintFactory
* @param Simulation : ---
*/
void add(int pays, int cluster, int clusterIndex, int pdt, bool Simulation);
int nbTermesContraintesPourLesCoutsDeDemarrage = 0;
};
2 changes: 1 addition & 1 deletion src/solver/optimisation/constraints/MinDownTime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ void MinDownTime::add(int pays, int cluster, int clusterIndex, int pdt, bool Sim
}
else
{
nbTermesContraintesPourLesCoutsDeDemarrage
problemeHebdo->NbTermesContraintesPourLesCoutsDeDemarrage
+= 1 + DureeMinimaleDArretDUnGroupeDuPalierThermique;
problemeHebdo->ProblemeAResoudre->NombreDeContraintes++;
}
Expand Down
1 change: 0 additions & 1 deletion src/solver/optimisation/constraints/MinDownTime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,5 +16,4 @@ class MinDownTime : private ConstraintFactory
* @param Simulation : ---
*/
void add(int pays, int cluster, int clusterIndex, int pdt, bool Simulation);
int nbTermesContraintesPourLesCoutsDeDemarrage = 0;
};
2 changes: 1 addition & 1 deletion src/solver/optimisation/constraints/NbDispUnitsMinBoundSinceMinUpTime.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ void NbDispUnitsMinBoundSinceMinUpTime::add(int pays,
}
else
{
nbTermesContraintesPourLesCoutsDeDemarrage
problemeHebdo->NbTermesContraintesPourLesCoutsDeDemarrage
+= 1 + 2 * DureeMinimaleDeMarcheDUnGroupeDuPalierThermique;
problemeHebdo->ProblemeAResoudre->NombreDeContraintes++;
}
Expand Down
1 change: 0 additions & 1 deletion src/solver/optimisation/constraints/NbDispUnitsMinBoundSinceMinUpTime.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ class NbDispUnitsMinBoundSinceMinUpTime : private ConstraintFactory
* @param Simulation : ---
*/
void add(int pays, int cluster, int clusterIndex, int pdt, bool Simulation);
int nbTermesContraintesPourLesCoutsDeDemarrage = 0;
};
2 changes: 1 addition & 1 deletion src/solver/optimisation/constraints/NbUnitsOutageLessThanNbUnitsStop.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ void NbUnitsOutageLessThanNbUnitsStop::add(int pays,
}
else
{
nbTermesContraintesPourLesCoutsDeDemarrage += 4;
problemeHebdo->NbTermesContraintesPourLesCoutsDeDemarrage += 2;
problemeHebdo->ProblemeAResoudre->NombreDeContraintes++;
}
}
1 change: 0 additions & 1 deletion src/solver/optimisation/constraints/NbUnitsOutageLessThanNbUnitsStop.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ class NbUnitsOutageLessThanNbUnitsStop : private ConstraintFactory
* @param Simulation : ---
*/
void add(int pays, int cluster, int clusterIndex, int pdt, bool Simulation);
int nbTermesContraintesPourLesCoutsDeDemarrage = 0;
};
2 changes: 1 addition & 1 deletion src/solver/optimisation/constraints/PMaxDispatchableGeneration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void PMaxDispatchableGeneration::add(int pays,
}
else
{
nbTermesContraintesPourLesCoutsDeDemarrage += 2;
problemeHebdo->NbTermesContraintesPourLesCoutsDeDemarrage += 2;
problemeHebdo->ProblemeAResoudre->NombreDeContraintes++;
}
}
1 change: 0 additions & 1 deletion src/solver/optimisation/constraints/PMaxDispatchableGeneration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ class PMaxDispatchableGeneration : private ConstraintFactory
* @param Simulation : ---
*/
void add(int pays, int cluster, int clusterIndex, int pdt, bool Simulation);
int nbTermesContraintesPourLesCoutsDeDemarrage = 0;
};
4 changes: 2 additions & 2 deletions src/solver/optimisation/constraints/PMinDispatchableGeneration.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ void PMinDispatchableGeneration::add(int pays,
}
else
{
nbTermesContraintesPourLesCoutsDeDemarrage += 2;
problemeHebdo->ProblemeAResoudre->NombreDeContraintes++;
problemeHebdo->NbTermesContraintesPourLesCoutsDeDemarrage += 2;
problemeHebdo->ProblemeAResoudre->NombreDeContraintes++;
}
}
1 change: 0 additions & 1 deletion src/solver/optimisation/constraints/PMinDispatchableGeneration.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,5 +17,4 @@ class PMinDispatchableGeneration : private ConstraintFactory
* @param Simulation : ---
*/
void add(int pays, int cluster, int clusterIndex, int pdt, bool Simulation);
int nbTermesContraintesPourLesCoutsDeDemarrage = 0;
};
19 changes: 0 additions & 19 deletions src/solver/optimisation/opt_construction_contraintes_couts_demarrage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,6 @@ void OPT_ConstruireLaMatriceDesContraintesDuProblemeLineaireCoutsDeDemarrage(
= problemeHebdo->NombreDePasDeTempsPourUneOptimisation;

ConstraintNamer constraintNamer(ProblemeAResoudre->NomDesContraintes);
int nbTermesContraintesPourLesCoutsDeDemarrage = 0;
for (uint32_t pays = 0; pays < problemeHebdo->NombreDePays; pays++)
{
const PALIERS_THERMIQUES& PaliersThermiquesDuPays
Expand All @@ -67,12 +66,7 @@ void OPT_ConstruireLaMatriceDesContraintesDuProblemeLineaireCoutsDeDemarrage(
for (int pdt = 0; pdt < nombreDePasDeTempsPourUneOptimisation; pdt++)
{
pMaxDispatchableGeneration.add(pays, palier, index, pdt, Simulation);
nbTermesContraintesPourLesCoutsDeDemarrage
+= pMaxDispatchableGeneration.nbTermesContraintesPourLesCoutsDeDemarrage;

pMinDispatchableGeneration.add(pays, palier, index, pdt, Simulation);
nbTermesContraintesPourLesCoutsDeDemarrage
+= pMinDispatchableGeneration.nbTermesContraintesPourLesCoutsDeDemarrage;
}
}
}
Expand All @@ -92,9 +86,6 @@ void OPT_ConstruireLaMatriceDesContraintesDuProblemeLineaireCoutsDeDemarrage(
ConsistenceNumberOfDispatchableUnits consistenceNumberOfDispatchableUnits(
problemeHebdo);
consistenceNumberOfDispatchableUnits.add(pays, palier, index, pdt, Simulation);
nbTermesContraintesPourLesCoutsDeDemarrage
+= consistenceNumberOfDispatchableUnits
.nbTermesContraintesPourLesCoutsDeDemarrage;
}
}
}
Expand All @@ -114,8 +105,6 @@ void OPT_ConstruireLaMatriceDesContraintesDuProblemeLineaireCoutsDeDemarrage(
for (int pdt = 0; pdt < nombreDePasDeTempsPourUneOptimisation; pdt++)
{
nbUnitsOutageLessThanNbUnitsStop.add(pays, palier, index, pdt, Simulation);
nbTermesContraintesPourLesCoutsDeDemarrage
+= nbUnitsOutageLessThanNbUnitsStop.nbTermesContraintesPourLesCoutsDeDemarrage;
}
}
}
Expand All @@ -136,8 +125,6 @@ void OPT_ConstruireLaMatriceDesContraintesDuProblemeLineaireCoutsDeDemarrage(
for (int pdt = 0; pdt < nombreDePasDeTempsPourUneOptimisation; pdt++)
{
nbDispUnitsMinBoundSinceMinUpTime.add(pays, palier, index, pdt, Simulation);
nbTermesContraintesPourLesCoutsDeDemarrage
+= nbDispUnitsMinBoundSinceMinUpTime.nbTermesContraintesPourLesCoutsDeDemarrage;
}
}
}
Expand All @@ -155,15 +142,9 @@ void OPT_ConstruireLaMatriceDesContraintesDuProblemeLineaireCoutsDeDemarrage(
for (int pdt = 0; pdt < nombreDePasDeTempsPourUneOptimisation; pdt++)
{
minDownTime.add(pays, palier, index, pdt, Simulation);
nbTermesContraintesPourLesCoutsDeDemarrage
+= minDownTime.nbTermesContraintesPourLesCoutsDeDemarrage;
}
}
}

if (Simulation)
problemeHebdo->NbTermesContraintesPourLesCoutsDeDemarrage
= nbTermesContraintesPourLesCoutsDeDemarrage;

return;
}