Test_centos7_release_67

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

Hide file tree

Showing 10 changed files with 4 additions and 10 deletions.
diff --git a/.github/workflows/qa_pr_cpp_centos7.yml b/.github/workflows/qa_pr_cpp_centos7.yml
@@ -63,6 +63,7 @@ jobs:
       - name: Clang Tidy
         run: |
           export MODIFIED_FILES=$(git diff --name-only --diff-filter=d origin/${{ github.base_ref }} origin/${{ github.head_ref }}  | grep -E ".*(metrix-simulator/src|metrix-simulator/log).*\.(cpp|hpp)$")
+          echo $MODIFIED_FILES
           if [ -n "$MODIFIED_FILES" ]; then
               clang-tidy $MODIFIED_FILES -p $GITHUB_WORKSPACE/metrix-simulator/build-centos7
           fi
@@ -154,7 +155,7 @@ jobs:
         if: github.event_name != 'release'
         run: |
           source /opt/rh/devtoolset-9/enable
-          cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DBoost_INCLUDE_DIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCODE_COVERAGE=FALSE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install
+          cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build -DCMAKE_BUILD_TYPE=Debug -DBoost_ROOT=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DBoost_INCLUDE_DIR=$GITHUB_WORKSPACE/__w/Boost/Boost/boost_1_73_0/installBoost -DCODE_COVERAGE=TRUE -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install
 
       - name: Build
         run: |

diff --git a/.github/workflows/qa_pr_cpp_ubuntu.yml b/.github/workflows/qa_pr_cpp_ubuntu.yml
@@ -41,6 +41,7 @@ jobs:
       - name: Clang Tidy
         run: |
           export MODIFIED_FILES=$(git diff --name-only --diff-filter=d origin/${{ github.base_ref }} origin/${{ github.head_ref }}  | grep -E ".*(metrix-simulator/src|metrix-simulator/log).*\.(cpp|hpp)$")
+          echo $MODIFIED_FILES
           if [ -n "$MODIFIED_FILES" ]; then
               clang-tidy $MODIFIED_FILES -p $GITHUB_WORKSPACE/metrix-simulator/build
           fi
@@ -103,7 +104,7 @@ jobs:
         run: >
           cmake -Wno-dev -S $GITHUB_WORKSPACE/metrix-simulator -B $GITHUB_WORKSPACE/metrix-simulator/build
           -DCMAKE_BUILD_TYPE=Debug
-          -DCODE_COVERAGE=FALSE
+          -DCODE_COVERAGE=TRUE
           -DCMAKE_INSTALL_PREFIX=$GITHUB_WORKSPACE/metrix-simulator/build/install
 
       - name: Build

diff --git a/metrix-simulator/src/calculeEmpilementGroupes.cpp b/metrix-simulator/src/calculeEmpilementGroupes.cpp
@@ -177,7 +177,6 @@ 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,7 +4024,6 @@ 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,7 +911,6 @@ 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,7 +16,6 @@ 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,7 +316,6 @@ 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,7 +14,6 @@
 
 #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,7 +1629,6 @@ 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,7 +3031,6 @@ 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 @@