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.

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

Multi period expansion planning #20

Draft
wants to merge 12 commits into
base: main
Choose a base branch
from
Draft

Commits on Mar 13, 2024

  1. Define tree structure for time blocks and data

    Define tree structure
    tbittar committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    541d349 View commit details
    Browse the repository at this point in the history
  2. Improve test description

    tbittar committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    7328c97 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    743ce1a View commit details
    Browse the repository at this point in the history
  4. Work in progress

    tbittar committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    75b3f37 View commit details
    Browse the repository at this point in the history
  5. Configuration menu
    Copy the full SHA
    76d058d View commit details
    Browse the repository at this point in the history
  6. Work in progress

    tbittar committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    5a25d3a View commit details
    Browse the repository at this point in the history
  7. Add comments

    tbittar committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    abed8a0 View commit details
    Browse the repository at this point in the history
  8. Fix rebase conflict

    tbittar committed Mar 13, 2024
    Configuration menu
    Copy the full SHA
    303bd14 View commit details
    Browse the repository at this point in the history

Commits on Jul 22, 2024

  1. Feature/network cloning (#28)

    * Move pathway tests to functional folder
    
    * Add replicate method to classes to be able to copy them to tree
    
    * Remove integration test from functional xpansion test
    
    * Modify DecisionTree
    
    * Move decision_tree test to unit tests folder
    
    * Ideas for the coupling_model
    
    * Write subproblem with tree
    
    * Add first pathway test
    
    * Add three node test for pathway
    
    * Add prob to tree nodes for expectation computation
    
    * Remove test debug init
    
    * Add prob to decision tree node
    
    * Add ExpectedValueStrategy to Benders
    
    * Retour of PR comments
    ianmnz authored Jul 22, 2024
    Configuration menu
    Copy the full SHA
    964297a View commit details
    Browse the repository at this point in the history

Commits on Jul 24, 2024

  1. Squashed merged commit from 'main'

    commit 7fa89213801af1f57e340bcc40b0dac1eb6c4af7
    Merge: 964297a 0074e94
    Author: Ian Menezes <ian.menezes@rte-france.com>
    Date:   Wed Jul 24 11:43:38 2024 +0200
    
        Merge branch 'main' into feature/investment_pathway
    
    commit 0074e94
    Author: ianmnz <ian.menezes@rte-france.com>
    Date:   Wed Jul 24 10:18:58 2024 +0200
    
        Add scenario benders test, bounds validation, and support for bool variables (#46)
    
        * Cherry-picked solver var name prefixes and suffixes
        * Added scenario tests for benders decomposed
        * Added BoolVar type
        * Added check for upper-lower variable bounds
        * Added index struct check for variable naming
        * Added check for inverted variable bounds
    
    commit a7fab1b
    Author: Yann-Temudjin <160221141+Yann-Temudjin@users.noreply.github.com>
    Date:   Mon Jun 17 17:02:47 2024 +0200
    
        Short term storage complex (#27)
    
        * test Quota CO2
    
        * reformatage du fichier test_quota_co2
    
        * Ajout de Short term storage complex dans les modeles standard
    
        * Ajout du test electrolyzer n inputs
    
        * fix taking in account the comments on the pull request
    
        * Ajout du isclose et modification des tests pour les electrolyzer n_inputs
    
        * Fixed test 3 and 4 of the electrolyzer_n_inputs
    
        * Model SHORT_TERM_STORAGE_COMPLEX avec le même test que le SIMPLE
    
        * fixed test short term storage
    
        * fixed generate data for short term storage complex
    
        * fixed import order
    
        * Formatting change
    
        ---------
    
        Co-authored-by: Thomas Bittar <thomas.bittar@rte-france.com>
    
    commit 12ccfd7
    Author: Louis Chouane <116257827+ChouaneLouis@users.noreply.github.com>
    Date:   Mon Jun 3 10:56:05 2024 +0200
    
        Re-implement functional tests in yaml + multiple fixes (#35)
    
        Solved multiple issues:
        - parsing of shift expressions was wrong
        - integer variables were not correctly transferred to solver
        - improved some error messages at parsing time
    
        Co-authored-by: vargastat <tatiana.vargas@rte-france.com>
    
    commit 346d852
    Merge: 1c1bbd2 52b5b62
    Author: ianmnz <ian.menezes@rte-france.com>
    Date:   Fri May 17 14:08:37 2024 +0200
    
        Merge pull request #34 from AntaresSimulatorTeam/test_performance_large_ast
    
        Performance test for deep AST
    
    commit 52b5b62
    Merge: dc4940d 1c1bbd2
    Author: Ian Menezes <ian.menezes@rte-france.com>
    Date:   Fri May 17 13:46:24 2024 +0200
    
        Merge branch 'main' into test_performance_large_ast
    
    commit dc4940d
    Author: Ian Menezes <ian.menezes@rte-france.com>
    Date:   Fri May 17 13:21:28 2024 +0200
    
        Add RecursionError raise check for tests
    
    commit f85d56e
    Author: Ian Menezes <ian.menezes@rte-france.com>
    Date:   Thu May 16 16:43:10 2024 +0200
    
        Remove unused generate_random_data function
    
    commit ead9b99
    Author: Ian Menezes <ian.menezes@rte-france.com>
    Date:   Thu May 16 16:19:38 2024 +0200
    
        Performance test: check large nb of port connections
    
    commit 1c1bbd2
    Author: vargastat <130074062+vargastat@users.noreply.github.com>
    Date:   Mon May 13 13:59:08 2024 +0200
    
        Yaml format for components and TSV format for timeseries (#37)
    
    commit acc77e8
    Author: Ian Menezes <ian.menezes@rte-france.com>
    Date:   Fri Apr 26 11:43:55 2024 +0200
    
        Performance test: check deep AST using sum() operator
    
    commit 1221880
    Merge: 9f419cd ecd3e1d
    Author: Florian Omnès <florian.omnes@rte-france.com>
    Date:   Tue Apr 23 17:36:48 2024 +0200
    
        Merge pull request #32 from AntaresSimulatorTeam/feature/upgrade-ortools
    
        Upgrade ortools in requirements
    
    commit ecd3e1d
    Author: Thomas Bittar <thomas.bittar@rte-france.com>
    Date:   Tue Apr 23 17:28:38 2024 +0200
    
        Remove unnecessary requirements
    
    commit be47c07
    Author: Thomas Bittar <thomas.bittar@rte-france.com>
    Date:   Tue Apr 23 17:14:10 2024 +0200
    
        Upgrade ortools in requirements
    
    commit 9f419cd
    Author: Juliette-Gerbaux <130555142+Juliette-Gerbaux@users.noreply.github.com>
    Date:   Fri Apr 19 09:46:19 2024 +0200
    
        Models/add new model (#30)
    
        * Add variant for electrolyzer subject to renewable
    
        * Add model hydro valley
    
        ---------
    
        Co-authored-by: Juliette-Gerbaux <juliette.gerbaux_externe@rte-france.com>
    
    commit fb547dd
    Author: Yann-Temudjin <160221141+Yann-Temudjin@users.noreply.github.com>
    Date:   Fri Apr 19 09:43:20 2024 +0200
    
        Model test yaml (#29)
    
        * test electrolyzer_n_inputs with yaml models
    
        * quota C02 test with yaml model
    
        * print to test the path
    
        * fixed path for the first n_input_electrolyzer_yaml test
    
        * fix of libs path and move of the tests to models
    
        * factorisation, removal of unused import and move of test files
    
        * reformat test
    
        * move tests of model to tests/model
    
        * Fix formatting
    
        * re-added libs_dir to model/conftest.py
    
        * added type declaration and removed unused argument
    
        ---------
    
        Co-authored-by: Thomas Bittar <thomas.bittar@rte-france.com>
    
    commit 7c7d2d5
    Author: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
    Date:   Fri Mar 29 17:17:58 2024 +0100
    
        Test case for AC link and PST models  (#2)
    
        Addition of an ac.yml library, and associated test cases.
    
        Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
    
    commit f9f9b3a
    Author: Yann-Temudjin <160221141+Yann-Temudjin@users.noreply.github.com>
    Date:   Fri Mar 22 15:34:36 2024 +0100
    
        test Quota CO2 (#17)
    
        * test Quota CO2
    
        * reformatage du fichier test_quota_co2
    
        * Ajout de Short term storage complex dans les modeles standard
    
        * Ajout du test electrolyzer n inputs
    
        * fix taking in account the comments on the pull request
    
        * Ajout du isclose et modification des tests pour les electrolyzer n_inputs
    
        * Fixed test 3 and 4 of the electrolyzer_n_inputs
    
    commit 94f13b1
    Author: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
    Date:   Wed Mar 20 17:24:33 2024 +0100
    
        Model library format parsing (#11)
    
        First implementation of library format parsing,
        including expressions parsing.
    
        Implementation notes:
         - ANTLR4 is used for expression parsing
         - pydantic together with PyYaml are used for yaml parsing
         - An additional layer of "unresolved" objects, that are the
           1-to-1 image of the input data, is introduced.
           Once everything is read, we can resolve all objects to
           actually use them for computation.
    
        Note:
        - Last additions for investment studies have not yet been included ("context" and separation between 2 objectives).
    
        ---------
    
        Signed-off-by: Sylvain Leclerc <sylvain.leclerc@rte-france.com>
        Signed-off-by: vargastat <tatiana.vargas@rte-france.com>
        Co-authored-by: vargastat <tatiana.vargas@rte-france.com>
    
    commit c4b0abd
    Author: Juliette-Gerbaux <130555142+Juliette-Gerbaux@users.noreply.github.com>
    Date:   Tue Mar 19 11:34:37 2024 +0100
    
        Add flow-based models (#23)
    
        * Add flow based models
    
        * Add new model for flow based with net positions
    
        * Delete useless model
    
        * Correct errors
    
        * Rename nodes to real countries to clarify differences between models
    
        * Small corrections
    
        ---------
    
        Co-authored-by: Juliette-Gerbaux <juliette.gerbaux_externe@rte-france.com>
    
    commit dfc8871
    Author: Juliette-Gerbaux <130555142+Juliette-Gerbaux@users.noreply.github.com>
    Date:   Tue Mar 19 11:34:16 2024 +0100
    
        Add models representing binding constrains (#25)
    
        * Correct error in stock model
    
        * Add model constraining total imports
    
        * Add nuclear modulation model
    
        * Add model with minimum electric vehicle load
    
        * Add hvdc model
    
        * Delete models because more efficient models are available with ports
    
        * Small corrections on names and temporal sums
    
        * Change model to take into account total import on a node
    
        * Small corrections
    
        ---------
    
        Co-authored-by: Juliette-Gerbaux <juliette.gerbaux_externe@rte-france.com>
    
    commit 2e2f8bb
    Author: tbittar <thomas.bittar@gmail.com>
    Date:   Fri Mar 15 16:40:17 2024 +0100
    
        Correct electrolyzer model typos (#26)
    
        * Fix sign mistakes
    
        * Fix sign and arrow direction
    
        ---------
    
        Co-authored-by: Thomas Bittar <thomas.bittar@rte-france.com>
    ianmnz committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    cf7282a View commit details
    Browse the repository at this point in the history
  2. Fixed var name tree prefix

    ianmnz committed Jul 24, 2024
    Configuration menu
    Copy the full SHA
    52705ff View commit details
    Browse the repository at this point in the history

Commits on Aug 21, 2024

  1. Configuration menu
    Copy the full SHA
    fbe54ff View commit details
    Browse the repository at this point in the history