Fix/test 50 windows (#1680)

* try fix * first test long test 2 * move implementation details * restore .yml
AntaresSimulatorTeam · Oct 5, 2023 · 8c362df · 8c362df
1 parent be2f769
commit 8c362df
Show file tree

Hide file tree

Showing 13 changed files with 7 additions and 32 deletions.
diff --git a/src/solver/optimisation/constraints/ConsistenceNumberOfDispatchableUnits.cpp b/src/solver/optimisation/constraints/ConsistenceNumberOfDispatchableUnits.cpp
@@ -41,7 +41,7 @@ void ConsistenceNumberOfDispatchableUnits::add(int pays,
     }
     else
     {
-        nbTermesContraintesPourLesCoutsDeDemarrage += 4;
+        problemeHebdo->NbTermesContraintesPourLesCoutsDeDemarrage += 4;
         problemeHebdo->ProblemeAResoudre->NombreDeContraintes++;
     }
 }
diff --git a/src/solver/optimisation/constraints/ConsistenceNumberOfDispatchableUnits.h b/src/solver/optimisation/constraints/ConsistenceNumberOfDispatchableUnits.h
@@ -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;
 };
diff --git a/src/solver/optimisation/constraints/MinDownTime.cpp b/src/solver/optimisation/constraints/MinDownTime.cpp
@@ -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++;
     }

diff --git a/src/solver/optimisation/constraints/MinDownTime.h b/src/solver/optimisation/constraints/MinDownTime.h
@@ -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;
 };
diff --git a/src/solver/optimisation/constraints/NbDispUnitsMinBoundSinceMinUpTime.cpp b/src/solver/optimisation/constraints/NbDispUnitsMinBoundSinceMinUpTime.cpp
@@ -52,7 +52,7 @@ void NbDispUnitsMinBoundSinceMinUpTime::add(int pays,
     }
     else
     {
-        nbTermesContraintesPourLesCoutsDeDemarrage
+        problemeHebdo->NbTermesContraintesPourLesCoutsDeDemarrage
           += 1 + 2 * DureeMinimaleDeMarcheDUnGroupeDuPalierThermique;
         problemeHebdo->ProblemeAResoudre->NombreDeContraintes++;
     }

diff --git a/src/solver/optimisation/constraints/NbDispUnitsMinBoundSinceMinUpTime.h b/src/solver/optimisation/constraints/NbDispUnitsMinBoundSinceMinUpTime.h
@@ -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;
 };
diff --git a/src/solver/optimisation/constraints/NbUnitsOutageLessThanNbUnitsStop.cpp b/src/solver/optimisation/constraints/NbUnitsOutageLessThanNbUnitsStop.cpp
@@ -35,7 +35,7 @@ void NbUnitsOutageLessThanNbUnitsStop::add(int pays,
     }
     else
     {
-        nbTermesContraintesPourLesCoutsDeDemarrage += 4;
+        problemeHebdo->NbTermesContraintesPourLesCoutsDeDemarrage += 2;
         problemeHebdo->ProblemeAResoudre->NombreDeContraintes++;
     }
 }
diff --git a/src/solver/optimisation/constraints/NbUnitsOutageLessThanNbUnitsStop.h b/src/solver/optimisation/constraints/NbUnitsOutageLessThanNbUnitsStop.h
@@ -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;
 };
diff --git a/src/solver/optimisation/constraints/PMaxDispatchableGeneration.cpp b/src/solver/optimisation/constraints/PMaxDispatchableGeneration.cpp
@@ -32,7 +32,7 @@ void PMaxDispatchableGeneration::add(int pays,
     }
     else
     {
-        nbTermesContraintesPourLesCoutsDeDemarrage += 2;
+        problemeHebdo->NbTermesContraintesPourLesCoutsDeDemarrage += 2;
         problemeHebdo->ProblemeAResoudre->NombreDeContraintes++;
     }
 }
diff --git a/src/solver/optimisation/constraints/PMaxDispatchableGeneration.h b/src/solver/optimisation/constraints/PMaxDispatchableGeneration.h
@@ -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;
 };
diff --git a/src/solver/optimisation/constraints/PMinDispatchableGeneration.cpp b/src/solver/optimisation/constraints/PMinDispatchableGeneration.cpp
@@ -32,7 +32,7 @@ void PMinDispatchableGeneration::add(int pays,
     }
     else
     {
-        nbTermesContraintesPourLesCoutsDeDemarrage += 2;
-        problemeHebdo->ProblemeAResoudre->NombreDeContraintes++;
+          problemeHebdo->NbTermesContraintesPourLesCoutsDeDemarrage += 2;
+          problemeHebdo->ProblemeAResoudre->NombreDeContraintes++;
     }
 }
diff --git a/src/solver/optimisation/constraints/PMinDispatchableGeneration.h b/src/solver/optimisation/constraints/PMinDispatchableGeneration.h
@@ -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;
 };
diff --git a/src/solver/optimisation/opt_construction_contraintes_couts_demarrage.cpp b/src/solver/optimisation/opt_construction_contraintes_couts_demarrage.cpp
@@ -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
@@ -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;
             }
         }
     }
@@ -92,9 +86,6 @@ void OPT_ConstruireLaMatriceDesContraintesDuProblemeLineaireCoutsDeDemarrage(
                 ConsistenceNumberOfDispatchableUnits consistenceNumberOfDispatchableUnits(
                   problemeHebdo);
                 consistenceNumberOfDispatchableUnits.add(pays, palier, index, pdt, Simulation);
-                nbTermesContraintesPourLesCoutsDeDemarrage
-                  += consistenceNumberOfDispatchableUnits
-                       .nbTermesContraintesPourLesCoutsDeDemarrage;
             }
         }
     }
@@ -114,8 +105,6 @@ void OPT_ConstruireLaMatriceDesContraintesDuProblemeLineaireCoutsDeDemarrage(
             for (int pdt = 0; pdt < nombreDePasDeTempsPourUneOptimisation; pdt++)
             {
                 nbUnitsOutageLessThanNbUnitsStop.add(pays, palier, index, pdt, Simulation);
-                nbTermesContraintesPourLesCoutsDeDemarrage
-                  += nbUnitsOutageLessThanNbUnitsStop.nbTermesContraintesPourLesCoutsDeDemarrage;
             }
         }
     }
@@ -136,8 +125,6 @@ void OPT_ConstruireLaMatriceDesContraintesDuProblemeLineaireCoutsDeDemarrage(
             for (int pdt = 0; pdt < nombreDePasDeTempsPourUneOptimisation; pdt++)
             {
                 nbDispUnitsMinBoundSinceMinUpTime.add(pays, palier, index, pdt, Simulation);
-                nbTermesContraintesPourLesCoutsDeDemarrage
-                  += nbDispUnitsMinBoundSinceMinUpTime.nbTermesContraintesPourLesCoutsDeDemarrage;
             }
         }
     }
@@ -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;
 }