-
Notifications
You must be signed in to change notification settings - Fork 24
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
Fix/test 50 windows #1680
Fix/test 50 windows #1680
Conversation
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
As discussed, this deserves a bit of refactoring because the current code is error-prone.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Revert windows-vcpkg.yml, check that long-tests-2 are passing and we're good to merge
Kudos, SonarCloud Quality Gate passed! |
* disable ghpages for pr (AntaresSimulatorTeam#1683) * disable ghpages for pr * Revert "disable ghpages for pr" This reverts commit 3c162df. * disable ghpages for pr * Fix/test 50 windows (AntaresSimulatorTeam#1680) * try fix * first test long test 2 * move implementation details * restore .yml * New log msg when solver not found in or-tools (AntaresSimulatorTeam#1687) * New log msg when solver not found in or-tools * New log msg when solver not found in or-tools : oops, correct an oblivion * Remove dependency to UI, use RAII to handle resources (AntaresSimulatorTeam#1678) * Remove dependency to UI : removal from solver * Remove dependency to UI : calling the main arguments pre-processing from outside * Remove dependency to UI : removal from analyzer * Remove dependency to UI : replace the dependency to UI in other stand alone targets + correct new target include files paths * Remove dependency to UI : forgot to add header file to repository * Remove dependency to UI : introduce a RAII to automatically destroy the allocated memory * Add & use IntoUTF8ArgsTranslator::convert (AntaresSimulatorTeam#1684) * Add & use IntoUTF8ArgsTranslator::convert * Fix header inclusion * Fix windows build * Fix build * Fix build (bis) * Remove ref to argc, make IntoUTF8ArgsTranslator's API homogenous * Apply clang-format --------- Co-authored-by: Florian Omnès <[email protected]> * Add area name for rare error case (AntaresSimulatorTeam#1695) * Fixes swallowed exceptions in computation thread (AntaresSimulatorTeam#1685) * Fixes swallowed exceptions in computation thread Exceptions are now transferred from the computation thread to the main one using std::future mechanisms. Only the first encountered exception is thrown in the main thread. Signed-off-by: Sylvain Leclerc <[email protected]> * - transfer exceptions occuring in zip_writer too - some cleanup - an integration test to check behaviour in simulation Signed-off-by: Sylvain Leclerc <[email protected]> * Take into account review Signed-off-by: Sylvain Leclerc <[email protected]> * - Separate thread pool for zip IO - Addition of a flush method for writers, to synchronize - Addition of tests for zip writer Signed-off-by: Sylvain Leclerc <[email protected]> * Some comments Signed-off-by: Sylvain Leclerc <[email protected]> * Throw more exceptions from zip writer Signed-off-by: Sylvain Leclerc <[email protected]> * Fix headers Signed-off-by: Sylvain Leclerc <[email protected]> * Fix missing header (windows build) Signed-off-by: Sylvain Leclerc <[email protected]> * Take into account review Signed-off-by: Sylvain Leclerc <[email protected]> * Fix windows build again Signed-off-by: Sylvain Leclerc <[email protected]> --------- Signed-off-by: Sylvain Leclerc <[email protected]> * Fix regression on cluster renaming, add unit tests (AntaresSimulatorTeam#1699) Signed-off-by: Sylvain Leclerc <[email protected]> * Fix segfault encountered when importing logs (AntaresSimulatorTeam#1702) * Fix segfault when a study is invalid * Re-throw loading exceptions in case of failure * Formatting * Rename * Use minizip-ng 4.0.1 (from 3.0.7) (AntaresSimulatorTeam#1696) * Use minizip-ng 4.0.1 (from 3.0.7) * Update writer tests * Feature/optimization discrete variables (AntaresSimulatorTeam#670) * glop solver activated intVariable array added to store information on discrete variables * Adding discrete value array in problem creation Renaming intVar into VariablesEntieres Allocation + filling values during optimization variables creation * Giving discrete variables info to solvers * Making use of MakeVar(min, max, isInteger, name) * filling VariablesEntieres complete * Fix xpress identifier, use MIP solver if the problem is MIP * Deactivating heuristic and second optimization (by commenting) Only bringing back reduced costs and dual values when using MIP model * Remove commented second optimization ERRATUM for preceding commit : reduced costs and dual values when using *LP* model * Reactivated heuristics / second optimization Adding an epsilon to int vars to measure stability through heuristics * Use of round function for int vars out of XPRESS * Test : remove epsilon to output of XPRESS Check influence on heuristic * Going back without 2nd optimization Enabling solver output log * remove commented code * Renaming ucHeuristic and ucMILP (resp. to ucFast and ucAccurate) * also renaming selection methods * Adding "milp" parameter as option of optimisation conditionning "VariablesEntieres" to the use of milp parameter * activating 2nd optimization (if not milp) * No NODU smoothing needed for MILP resolution * changed memory required for input with MILP * (first draft) check of ortools if milp model * error messages changes * refactoring yearEndBuildFromThermalClusterIndex separating smoothing and costs computing not activating smoothing when MILP resolution * reactivating NODU smoothing for MILP solve * fix case * Cleaning, renaming after comments Moving isMIP to named_problem * adding methods to compute ON_Min and ON_Max * remove unused variable * Apply clang-format * remaking isMIP into a method * removing const typing * [TEMP] Test log xpress + 1 thread * remove xpress parameters * adding parameters --ortools-parameters="" for specific solver parameters string --ortools-verbose to activate verbosity * [TEMP] removing ortools presolve * Revert "[TEMP] removing ortools presolve" This reverts commit 9500cec. * changing parameters setting for ortools solvers * 2 solvers kept in memory for optim 1/2 for milp, 2nd optim with min/max fixed for M * [TEMP] individual year objectives * Revert "[TEMP] individual year objectives" This reverts commit 7d6164c. * Apply clang-format * fix : fixing NODU min and max for ALL timesteps in MILP mode * Fix build, formatting * Remove ortoolsVerbose & ortoolsParamsString * Simplify condition a bit * Fix variable type in MPS writer * [skip ci] Add TODO * Add forgotten data member * Revert state.* * One more fix * Fix build for GUI * Factorize UI code a bit * Move `checkOrtoolsUsage` * Add comment * Restore existing behavior for unitCommitmentMode = ucHeuristicAccurate * Small clean-up * Restore dual values & reduced costs * Renaming * Setup relaxation * Revert "Setup relaxation" This reverts commit 1c6411b. * Remove relaxation, use 0 for reduced cost & marginal values * Format * Partial revert * Disable variables requiring dual values / marg costs when ucMode = milp * Add comments * Add comments in `enum UnitCommitmentMode` * Remove obsolete TODO note * Add OutputRetriever::thermalNbUnitsON * Add 2 unit tests with COIN * Remove obsolete TODO note * Fix formatting * Fix formatting * Skip 2nd optimization when solving with integer variables --------- Co-authored-by: Florian OMNES <[email protected]> Co-authored-by: Florian Omnes <[email protected]> * [CI] Upgrade python to 3.12 (AntaresSimulatorTeam#1710) * Python version consistency in CI (AntaresSimulatorTeam#1711) - Provide exact python executable path to cmake, to ensure it uses same python version as other CI steps - Consistent use of 3.12 in CI builds Signed-off-by: Sylvain Leclerc <[email protected]> * Remove global var NumeroChroniquesTireesParGroup (AntaresSimulatorTeam#1714) * [DEV] Use group timeseries instead of global var * Remove global var NumeroChroniquesTireesParInterconnexion (AntaresSimulatorTeam#1715) * [DEV] Use tsnumbers in variable/links * [DEV] Use tsnumbers in sim_calcul, fix condition * [DEV] Remove useless struct, fix compile * [DEV] Remove var NumeroChroniquesTireesParInterconnexion * Remove obsolete struct Signed-off-by: Sylvain Leclerc <[email protected]> * [DEV] Remove dir src/solver/aleatoire --------- Signed-off-by: Sylvain Leclerc <[email protected]> Co-authored-by: Sylvain Leclerc <[email protected]> * [DEV] Add antares web to README (AntaresSimulatorTeam#1720) * Refactor time series (AntaresSimulatorTeam#1677) * [DEV] Add classes TimeSeriesNumbers TimeSeries * [DEV] Add classes to cpp * [DEV] getTSNumber * [DEV] getCoeff getColumn * [FIX] Windows CI * [DEV] Use matrix<> instead of vector * [DEV] Add timeSeriesLoadFromFolder * [DEV] removed pointer from windseries add savetofolder add reset add typedef TSNumbers * [DEV] Wind compiling * [DEV] remove old wind series files * [FIX] crash * [FIX] getSeriesIndex * [DEV] load series * [DEV] remove load series files * [FIX] compile * [DEV] Comments * [DEV] revert reset() * [DEV] solar series * [DEV] remove solar series files * [FIX] Tests crashes * [DEV] Add static member emptyColumn * [DEV] remove useless if * Use generic class for load series (AntaresSimulatorTeam#1686) * [DEV] load series * [DEV] remove load series files * [FIX] compile * [DEV] Comments * [DEV] revert reset() * [DEV] Comments * [DEV] using TScoefficients * Refactor thermal & renewable series (AntaresSimulatorTeam#1693) * [DEV] Thermal series start * [FIX] getCoefficient() arg order * [DEV] Use Matrix<double> only * [DEV] Remove class DataSeriesCommon * [DEV] Add using TS * [skip ci] Add library series, move files to part/series * [DEV] Use library series * [DEV] Replace matrix<double> with TimeSeries::TS * [DEV] Remove template from class TimeSeriesConfigurer * [DEV] Clean valueAtTimeStep * [DEV] Comments and use series.reset() * Refactor hydro series (AntaresSimulatorTeam#1705) * [DEV] Removed hydro/series.hxx * [DEV] Use a ref for TSNumbers * [DEV] Use a ref for TSNumbers (AntaresSimulatorTeam#1706) * [DEV] Use TimeSeries for ror * [DEV] Modify operator[] behavior * [DEV] storage * [CI] Upgrade python to 3.12 * [DEV] mingen * [DEV] replace tsindex with year in hydro/management * [DEV] Remove getIndex from hydro series * [DEV] code smells * Make hydro ts count a private member (AntaresSimulatorTeam#1712) * Refactor max power TS checks : internalize count of generation time series (ror, storage, mingen) We should not be able to change a TS count without resizing the TS. This was allowed when because this count was a public data member. So we make it a private data member, and change it only when resizing the associated data. * Make hydro time series cont a private member --------- Co-authored-by: guilpier-code <[email protected]> * [FIX] Compile * [FIX] Code smells * [FIX] Code smells * [DEV] valueAtTimeStep uses year hour now * Unit tests for timeseries (AntaresSimulatorTeam#1713) * [DEV] Fix include path * [DEV] move folder series * [DEV] Use timestep instead of hour * [FIX] several comments for class series * [FIX] more comments * [FIX] try fix windows CI --------- Co-authored-by: guilpier-code <[email protected]> * Try adding path to sirius for test execution in CI Signed-off-by: Sylvain Leclerc <[email protected]> * Only windows CI for testing Signed-off-by: Sylvain Leclerc <[email protected]> * Revert "Only windows CI for testing" This reverts commit 9f4fe85. * Try cmake_prefix_path instead of path for sirius lib Signed-off-by: Sylvain Leclerc <[email protected]> * Only windows CI for testing Signed-off-by: Sylvain Leclerc <[email protected]> --------- Signed-off-by: Sylvain Leclerc <[email protected]> Co-authored-by: abdoulbari zakir <[email protected]> Co-authored-by: guilpier-code <[email protected]> Co-authored-by: Florian Omnès <[email protected]> Co-authored-by: Sylvain Leclerc <[email protected]> Co-authored-by: HugoKulesza <[email protected]> Co-authored-by: Florian Omnes <[email protected]> Co-authored-by: payetvin <[email protected]>
* Create LICENSE Signed-off-by: بلال مسلوب <[email protected]> * Fix/path to sirius for unit tests alternative (#280) * disable ghpages for pr (AntaresSimulatorTeam#1683) * disable ghpages for pr * Revert "disable ghpages for pr" This reverts commit 3c162df. * disable ghpages for pr * Fix/test 50 windows (AntaresSimulatorTeam#1680) * try fix * first test long test 2 * move implementation details * restore .yml * New log msg when solver not found in or-tools (AntaresSimulatorTeam#1687) * New log msg when solver not found in or-tools * New log msg when solver not found in or-tools : oops, correct an oblivion * Remove dependency to UI, use RAII to handle resources (AntaresSimulatorTeam#1678) * Remove dependency to UI : removal from solver * Remove dependency to UI : calling the main arguments pre-processing from outside * Remove dependency to UI : removal from analyzer * Remove dependency to UI : replace the dependency to UI in other stand alone targets + correct new target include files paths * Remove dependency to UI : forgot to add header file to repository * Remove dependency to UI : introduce a RAII to automatically destroy the allocated memory * Add & use IntoUTF8ArgsTranslator::convert (AntaresSimulatorTeam#1684) * Add & use IntoUTF8ArgsTranslator::convert * Fix header inclusion * Fix windows build * Fix build * Fix build (bis) * Remove ref to argc, make IntoUTF8ArgsTranslator's API homogenous * Apply clang-format --------- Co-authored-by: Florian Omnès <[email protected]> * Add area name for rare error case (AntaresSimulatorTeam#1695) * Fixes swallowed exceptions in computation thread (AntaresSimulatorTeam#1685) * Fixes swallowed exceptions in computation thread Exceptions are now transferred from the computation thread to the main one using std::future mechanisms. Only the first encountered exception is thrown in the main thread. Signed-off-by: Sylvain Leclerc <[email protected]> * - transfer exceptions occuring in zip_writer too - some cleanup - an integration test to check behaviour in simulation Signed-off-by: Sylvain Leclerc <[email protected]> * Take into account review Signed-off-by: Sylvain Leclerc <[email protected]> * - Separate thread pool for zip IO - Addition of a flush method for writers, to synchronize - Addition of tests for zip writer Signed-off-by: Sylvain Leclerc <[email protected]> * Some comments Signed-off-by: Sylvain Leclerc <[email protected]> * Throw more exceptions from zip writer Signed-off-by: Sylvain Leclerc <[email protected]> * Fix headers Signed-off-by: Sylvain Leclerc <[email protected]> * Fix missing header (windows build) Signed-off-by: Sylvain Leclerc <[email protected]> * Take into account review Signed-off-by: Sylvain Leclerc <[email protected]> * Fix windows build again Signed-off-by: Sylvain Leclerc <[email protected]> --------- Signed-off-by: Sylvain Leclerc <[email protected]> * Fix regression on cluster renaming, add unit tests (AntaresSimulatorTeam#1699) Signed-off-by: Sylvain Leclerc <[email protected]> * Fix segfault encountered when importing logs (AntaresSimulatorTeam#1702) * Fix segfault when a study is invalid * Re-throw loading exceptions in case of failure * Formatting * Rename * Use minizip-ng 4.0.1 (from 3.0.7) (AntaresSimulatorTeam#1696) * Use minizip-ng 4.0.1 (from 3.0.7) * Update writer tests * Feature/optimization discrete variables (AntaresSimulatorTeam#670) * glop solver activated intVariable array added to store information on discrete variables * Adding discrete value array in problem creation Renaming intVar into VariablesEntieres Allocation + filling values during optimization variables creation * Giving discrete variables info to solvers * Making use of MakeVar(min, max, isInteger, name) * filling VariablesEntieres complete * Fix xpress identifier, use MIP solver if the problem is MIP * Deactivating heuristic and second optimization (by commenting) Only bringing back reduced costs and dual values when using MIP model * Remove commented second optimization ERRATUM for preceding commit : reduced costs and dual values when using *LP* model * Reactivated heuristics / second optimization Adding an epsilon to int vars to measure stability through heuristics * Use of round function for int vars out of XPRESS * Test : remove epsilon to output of XPRESS Check influence on heuristic * Going back without 2nd optimization Enabling solver output log * remove commented code * Renaming ucHeuristic and ucMILP (resp. to ucFast and ucAccurate) * also renaming selection methods * Adding "milp" parameter as option of optimisation conditionning "VariablesEntieres" to the use of milp parameter * activating 2nd optimization (if not milp) * No NODU smoothing needed for MILP resolution * changed memory required for input with MILP * (first draft) check of ortools if milp model * error messages changes * refactoring yearEndBuildFromThermalClusterIndex separating smoothing and costs computing not activating smoothing when MILP resolution * reactivating NODU smoothing for MILP solve * fix case * Cleaning, renaming after comments Moving isMIP to named_problem * adding methods to compute ON_Min and ON_Max * remove unused variable * Apply clang-format * remaking isMIP into a method * removing const typing * [TEMP] Test log xpress + 1 thread * remove xpress parameters * adding parameters --ortools-parameters="" for specific solver parameters string --ortools-verbose to activate verbosity * [TEMP] removing ortools presolve * Revert "[TEMP] removing ortools presolve" This reverts commit 9500cec. * changing parameters setting for ortools solvers * 2 solvers kept in memory for optim 1/2 for milp, 2nd optim with min/max fixed for M * [TEMP] individual year objectives * Revert "[TEMP] individual year objectives" This reverts commit 7d6164c. * Apply clang-format * fix : fixing NODU min and max for ALL timesteps in MILP mode * Fix build, formatting * Remove ortoolsVerbose & ortoolsParamsString * Simplify condition a bit * Fix variable type in MPS writer * [skip ci] Add TODO * Add forgotten data member * Revert state.* * One more fix * Fix build for GUI * Factorize UI code a bit * Move `checkOrtoolsUsage` * Add comment * Restore existing behavior for unitCommitmentMode = ucHeuristicAccurate * Small clean-up * Restore dual values & reduced costs * Renaming * Setup relaxation * Revert "Setup relaxation" This reverts commit 1c6411b. * Remove relaxation, use 0 for reduced cost & marginal values * Format * Partial revert * Disable variables requiring dual values / marg costs when ucMode = milp * Add comments * Add comments in `enum UnitCommitmentMode` * Remove obsolete TODO note * Add OutputRetriever::thermalNbUnitsON * Add 2 unit tests with COIN * Remove obsolete TODO note * Fix formatting * Fix formatting * Skip 2nd optimization when solving with integer variables --------- Co-authored-by: Florian OMNES <[email protected]> Co-authored-by: Florian Omnes <[email protected]> * [CI] Upgrade python to 3.12 (AntaresSimulatorTeam#1710) * Python version consistency in CI (AntaresSimulatorTeam#1711) - Provide exact python executable path to cmake, to ensure it uses same python version as other CI steps - Consistent use of 3.12 in CI builds Signed-off-by: Sylvain Leclerc <[email protected]> * Remove global var NumeroChroniquesTireesParGroup (AntaresSimulatorTeam#1714) * [DEV] Use group timeseries instead of global var * Remove global var NumeroChroniquesTireesParInterconnexion (AntaresSimulatorTeam#1715) * [DEV] Use tsnumbers in variable/links * [DEV] Use tsnumbers in sim_calcul, fix condition * [DEV] Remove useless struct, fix compile * [DEV] Remove var NumeroChroniquesTireesParInterconnexion * Remove obsolete struct Signed-off-by: Sylvain Leclerc <[email protected]> * [DEV] Remove dir src/solver/aleatoire --------- Signed-off-by: Sylvain Leclerc <[email protected]> Co-authored-by: Sylvain Leclerc <[email protected]> * [DEV] Add antares web to README (AntaresSimulatorTeam#1720) * Refactor time series (AntaresSimulatorTeam#1677) * [DEV] Add classes TimeSeriesNumbers TimeSeries * [DEV] Add classes to cpp * [DEV] getTSNumber * [DEV] getCoeff getColumn * [FIX] Windows CI * [DEV] Use matrix<> instead of vector * [DEV] Add timeSeriesLoadFromFolder * [DEV] removed pointer from windseries add savetofolder add reset add typedef TSNumbers * [DEV] Wind compiling * [DEV] remove old wind series files * [FIX] crash * [FIX] getSeriesIndex * [DEV] load series * [DEV] remove load series files * [FIX] compile * [DEV] Comments * [DEV] revert reset() * [DEV] solar series * [DEV] remove solar series files * [FIX] Tests crashes * [DEV] Add static member emptyColumn * [DEV] remove useless if * Use generic class for load series (AntaresSimulatorTeam#1686) * [DEV] load series * [DEV] remove load series files * [FIX] compile * [DEV] Comments * [DEV] revert reset() * [DEV] Comments * [DEV] using TScoefficients * Refactor thermal & renewable series (AntaresSimulatorTeam#1693) * [DEV] Thermal series start * [FIX] getCoefficient() arg order * [DEV] Use Matrix<double> only * [DEV] Remove class DataSeriesCommon * [DEV] Add using TS * [skip ci] Add library series, move files to part/series * [DEV] Use library series * [DEV] Replace matrix<double> with TimeSeries::TS * [DEV] Remove template from class TimeSeriesConfigurer * [DEV] Clean valueAtTimeStep * [DEV] Comments and use series.reset() * Refactor hydro series (AntaresSimulatorTeam#1705) * [DEV] Removed hydro/series.hxx * [DEV] Use a ref for TSNumbers * [DEV] Use a ref for TSNumbers (AntaresSimulatorTeam#1706) * [DEV] Use TimeSeries for ror * [DEV] Modify operator[] behavior * [DEV] storage * [CI] Upgrade python to 3.12 * [DEV] mingen * [DEV] replace tsindex with year in hydro/management * [DEV] Remove getIndex from hydro series * [DEV] code smells * Make hydro ts count a private member (AntaresSimulatorTeam#1712) * Refactor max power TS checks : internalize count of generation time series (ror, storage, mingen) We should not be able to change a TS count without resizing the TS. This was allowed when because this count was a public data member. So we make it a private data member, and change it only when resizing the associated data. * Make hydro time series cont a private member --------- Co-authored-by: guilpier-code <[email protected]> * [FIX] Compile * [FIX] Code smells * [FIX] Code smells * [DEV] valueAtTimeStep uses year hour now * Unit tests for timeseries (AntaresSimulatorTeam#1713) * [DEV] Fix include path * [DEV] move folder series * [DEV] Use timestep instead of hour * [FIX] several comments for class series * [FIX] more comments * [FIX] try fix windows CI --------- Co-authored-by: guilpier-code <[email protected]> * Try adding path to sirius for test execution in CI Signed-off-by: Sylvain Leclerc <[email protected]> * Only windows CI for testing Signed-off-by: Sylvain Leclerc <[email protected]> * Revert "Only windows CI for testing" This reverts commit 9f4fe85. * Try cmake_prefix_path instead of path for sirius lib Signed-off-by: Sylvain Leclerc <[email protected]> * Only windows CI for testing Signed-off-by: Sylvain Leclerc <[email protected]> --------- Signed-off-by: Sylvain Leclerc <[email protected]> Co-authored-by: abdoulbari zakir <[email protected]> Co-authored-by: guilpier-code <[email protected]> Co-authored-by: Florian Omnès <[email protected]> Co-authored-by: Sylvain Leclerc <[email protected]> Co-authored-by: HugoKulesza <[email protected]> Co-authored-by: Florian Omnes <[email protected]> Co-authored-by: payetvin <[email protected]> --------- Signed-off-by: بلال مسلوب <[email protected]> Signed-off-by: Sylvain Leclerc <[email protected]> Co-authored-by: abdoulbari zakir <[email protected]> Co-authored-by: guilpier-code <[email protected]> Co-authored-by: Florian Omnès <[email protected]> Co-authored-by: Sylvain Leclerc <[email protected]> Co-authored-by: HugoKulesza <[email protected]> Co-authored-by: Florian Omnes <[email protected]> Co-authored-by: payetvin <[email protected]>
this Pr is intended to fix
long-tests-2/050 Export MPS File/