Test_centos7_release_66

Signed-off-by: arnaud <[email protected]>
ARnDOSrte · Oct 17, 2023 · aa795d6 · aa795d6
1 parent b340566
commit aa795d6
Show file tree

Hide file tree

Showing 10 changed files with 11 additions and 3 deletions.
diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml
@@ -77,7 +77,7 @@ jobs:
           yum install -y epel-release
           yum install -y git redhat-lsb-core make wget centos-release-scl scl-utils
           yum install -y devtoolset-9
-          yum install -y python3-pip
+          yum install -y python3 python3-pip
 
         
       - name: Setup cmake
@@ -163,7 +163,7 @@ jobs:
           cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target install --parallel 2
 
       - name: Tests
-        run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 -R "bug_pne" --output-on-failure
+        run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 --output-on-failure
 
       - name: Code coverage
         run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target code-coverage

diff --git a/.github/workflows/qa_pr_cpp_ubuntu.yml b/.github/workflows/qa_pr_cpp_ubuntu.yml
@@ -113,7 +113,7 @@ jobs:
           cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --parallel 2 --target install
 
       - name: Tests
-        run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 -R "bug_pne" --output-on-failure
+        run: cd $GITHUB_WORKSPACE/metrix-simulator/build && ctest -j8 --output-on-failure
 
       - name: Code coverage
         run: cmake --build $GITHUB_WORKSPACE/metrix-simulator/build --target code-coverage

diff --git a/metrix-simulator/src/calculeEmpilementGroupes.cpp b/metrix-simulator/src/calculeEmpilementGroupes.cpp
@@ -177,6 +177,7 @@ int Calculer::empilementEconomiqueDesGroupes(const std::shared_ptr<Variante>& va
         LOG_ALL(info) << err::ioDico().msg("INFOSPXPenalisationTDHVDC");
     }
 
+
     // utilisation de PneSolveur
     int status = METRIX_PAS_PROBLEME;
     status = PneSolveur(UTILISATION_SIMPLEXE, varianteCourante);

diff --git a/metrix-simulator/src/calculecrirecontraintesdodu.cpp b/metrix-simulator/src/calculecrirecontraintesdodu.cpp
@@ -4024,6 +4024,7 @@ int Calculer::ajoutContraintes(bool& existe_contrainte_active,
     return METRIX_PAS_PROBLEME;
 }
 
+
 int Calculer::ajoutContrainte(const std::shared_ptr<Contrainte>& ctre, const std::vector<double>& secondMembreFixe)
 {
     if ((ctre->ctrSup_ && ctre->maxT_ == config::constants::valdef)

diff --git a/metrix-simulator/src/calculmacrofonctions.cpp b/metrix-simulator/src/calculmacrofonctions.cpp
@@ -911,6 +911,7 @@ void Calculer::printFctObj(bool silent)
         }
     }
 
+
     consoTotale_ = sumProdApresEmpilement;
 
     fonction_objectif_C_ += fonction_objectif_G_cur_ + fonction_objectif_D_cur_;

diff --git a/metrix-simulator/src/compute/solver.cpp b/metrix-simulator/src/compute/solver.cpp
@@ -16,6 +16,7 @@ namespace compute
 {
 void Solver::solve(PROBLEME_A_RESOUDRE* pne_problem) { PNE_Solveur(pne_problem); }
 
+
 void Solver::solve(PROBLEME_SIMPLEXE* spx_problem)
 {
     if (problem_ != nullptr) {

diff --git a/metrix-simulator/src/config/configuration.cpp b/metrix-simulator/src/config/configuration.cpp
@@ -316,6 +316,7 @@ void Configuration::initWithRawConfig(const raw_configuration& raw_config)
     cost_ecart_ = helper::updateValueNumber(std::get<INTEGER>(raw_config), "COUTECAR", 10);
     noise_cost_ = helper::updateValueNumber(std::get<FLOAT>(raw_config), "NULLCOST", 0.5);
 
+
     lost_load_detailed_max_ = helper::updateValueNumber(std::get<INTEGER>(raw_config), "LOSTCMAX", 100U);
 
     // log level

diff --git a/metrix-simulator/src/margin_variations_compute.cpp b/metrix-simulator/src/margin_variations_compute.cpp
@@ -14,6 +14,7 @@
 
 #include <algorithm>
 
+
 MarginVariationMatrix::MarginVariationMatrix(int nbConstraints,
                                              int nbComplementaryVar,
                                              int nbVars,

diff --git a/metrix-simulator/src/metrix2assess.cpp b/metrix-simulator/src/metrix2assess.cpp
@@ -1629,6 +1629,7 @@ bool Calculer::computeCosts(const std::vector<int>& constraintsToDelail,
                                      << typeEtat_[numVar];
                 }
 
+
             } else if (typeOu[j] == 4) { // curatif
                 if (typeEtat_[numVar] == GRP_CUR_H || typeEtat_[numVar] == GRP_CUR_B || typeEtat_[numVar] == CONSO_B
                     || typeEtat_[numVar] == CONSO_H || typeEtat_[numVar] == DEPH_CUR_B

diff --git a/metrix-simulator/src/reseau.cpp b/metrix-simulator/src/reseau.cpp
@@ -3031,6 +3031,7 @@ void Reseau::updateVariant(MapQuadinVar& mapping, const config::VariantConfigura
         }
     }
 
+
     for (const auto& group : config.randomGroups) {
         auto groupesIt = groupes_.find(group);
         if (groupesIt != groupes_.end()) {
-Original file line number
+Diff line change
@@ Expand Up @@
         return METRIX_PAS_PROBLEME;
     }
     int Calculer::ajoutContrainte(const std::shared_ptr<Contrainte>& ctre, const std::vector<double>& secondMembreFixe)
     {
         if ((ctre->ctrSup_ && ctre->maxT_ == config::constants::valdef)
@@ Expand Down @@