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

Ampl export : extended exporter #2604

Open
wants to merge 85 commits into
base: main
Choose a base branch
from
Open

Commits on Jun 2, 2023

  1. add constructor with list instead of varargs

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    9379bef View commit details
    Browse the repository at this point in the history
  2. WIP add ampl export version

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    dbf18e0 View commit details
    Browse the repository at this point in the history
  3. refactor all writing to BasicAmplExporter

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    4143d1a View commit details
    Browse the repository at this point in the history
  4. match setVersion to return this

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    84987ea View commit details
    Browse the repository at this point in the history
  5. AmplExportVersion is now an interface

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    54fa975 View commit details
    Browse the repository at this point in the history
  6. missing author and licence

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 2, 2023
    Configuration menu
    Copy the full SHA
    8be12fe View commit details
    Browse the repository at this point in the history

Commits on Jun 5, 2023

  1. typo in writeThreeWindingsTranformersMiddleBusesColumnsToFormatter

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    595b20b View commit details
    Browse the repository at this point in the history
  2. integrating #2596 into this PR

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 5, 2023
    Configuration menu
    Copy the full SHA
    57cd659 View commit details
    Browse the repository at this point in the history

Commits on Jun 7, 2023

  1. fix function accepting only implementation and not interface

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    73884d9 View commit details
    Browse the repository at this point in the history
  2. Accept version in parameters of AmplExport service

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 7, 2023
    Configuration menu
    Copy the full SHA
    8c67231 View commit details
    Browse the repository at this point in the history

Commits on Jun 12, 2023

  1. add header file indicating version

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    fc3adf0 View commit details
    Browse the repository at this point in the history
  2. fix test because of new version parameter

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 12, 2023
    Configuration menu
    Copy the full SHA
    38eba0a View commit details
    Browse the repository at this point in the history

Commits on Jun 13, 2023

  1. Configuration menu
    Copy the full SHA
    639bbd5 View commit details
    Browse the repository at this point in the history
  2. fix BasicAmplExporter according to b7f9c3d

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    a0160f3 View commit details
    Browse the repository at this point in the history
  3. clean

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    261c0e0 View commit details
    Browse the repository at this point in the history
  4. add networkUtil

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    0770a2c View commit details
    Browse the repository at this point in the history
  5. add getters for inheritance

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    54dd6c1 View commit details
    Browse the repository at this point in the history
  6. added ExtendedAmplExporter

    remove static getFactory
    
    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    7e559a9 View commit details
    Browse the repository at this point in the history
  7. added new columns :

    Slack bus boolean in Bus
    r g and b in TapSteps
    regulating bus id in Generators and Svc
    
    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    353c1f1 View commit details
    Browse the repository at this point in the history
  8. wip tests

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    bde0378 View commit details
    Browse the repository at this point in the history
  9. export is in busView

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    6e5cb2d View commit details
    Browse the repository at this point in the history
  10. WIP tap tests

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    334e7e0 View commit details
    Browse the repository at this point in the history
  11. clean public for tests

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Jun 13, 2023
    Configuration menu
    Copy the full SHA
    3e11f7b View commit details
    Browse the repository at this point in the history

Commits on Aug 7, 2023

  1. fix constants typo

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Aug 7, 2023
    Configuration menu
    Copy the full SHA
    39060bf View commit details
    Browse the repository at this point in the history

Commits on Aug 9, 2023

  1. fix MVar to MVAr

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    4e1c694 View commit details
    Browse the repository at this point in the history
  2. fix MVar to MVAr

    Signed-off-by: Nicolas Pierre <nicolas.pierre@artelys.com>
    Nicolas Pierre committed Aug 9, 2023
    Configuration menu
    Copy the full SHA
    96d8e90 View commit details
    Browse the repository at this point in the history

Commits on Aug 31, 2023

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

Commits on Nov 2, 2023

  1. Merge branch 'main' into ampl/export-slack

    Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com>
    olperr1 committed Nov 2, 2023
    Configuration menu
    Copy the full SHA
    0f27df1 View commit details
    Browse the repository at this point in the history

Commits on Nov 6, 2023

  1. formatting

    Co-authored-by: Olivier Perrin <olivier.perrin@rte-france.com>
    Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com>
    2 people authored and Pauline Jean-Marie committed Nov 6, 2023
    Configuration menu
    Copy the full SHA
    43dabbb View commit details
    Browse the repository at this point in the history

Commits on Nov 10, 2023

  1. SPDX clause missing

    Co-authored-by: Olivier Perrin <olivier.perrin@rte-france.com>
    Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com>
    2 people authored and Pauline Jean-Marie committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    51a9598 View commit details
    Browse the repository at this point in the history
  2. escape email to avoid javadoc warnings

    Co-authored-by: Olivier Perrin <olivier.perrin@rte-france.com>
    Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com>
    2 people authored and Pauline Jean-Marie committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    20bc489 View commit details
    Browse the repository at this point in the history
  3. Add missing Override

    Co-authored-by: Olivier Perrin <olivier.perrin@rte-france.com>
    Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com>
    2 people authored and Pauline Jean-Marie committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    54cdc68 View commit details
    Browse the repository at this point in the history
  4. Improve switch case

    Co-authored-by: Olivier Perrin <olivier.perrin@rte-france.com>
    Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com>
    2 people authored and Pauline Jean-Marie committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    4db1b94 View commit details
    Browse the repository at this point in the history
  5. To be consistent

    Co-authored-by: Olivier Perrin <olivier.perrin@rte-france.com>
    Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com>
    2 people authored and Pauline Jean-Marie committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    fa3aa31 View commit details
    Browse the repository at this point in the history
  6. Distinct columns headers from suffix

    Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com>
    Pauline Jean-Marie committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    9a08421 View commit details
    Browse the repository at this point in the history
  7. If we want to use valueOf which exist on enum, than there is not usag…

    …e of interface AmplExportVersion without using also its enum implementation,
    
    so we merge the interface and its implementation. No new implementation are planned, only additional enum values.
    
    Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com>
    Pauline Jean-Marie committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    759507d View commit details
    Browse the repository at this point in the history
  8. Fix comment

    Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com>
    Pauline Jean-Marie committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    2331afe View commit details
    Browse the repository at this point in the history
  9. Light refacto

    Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com>
    Pauline Jean-Marie committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    5454e50 View commit details
    Browse the repository at this point in the history
  10. Actual version of Ampl is 1.0 so use that instead of V1_LEGACY

    NB. Which string is used? Enum.name is "V1_0" and seems to be used in AmplExporter but there is another string AmplColumnsExporter.EXPORTER_ID which is "1.0"
    
    Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com>
    Pauline Jean-Marie committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    8f60ac3 View commit details
    Browse the repository at this point in the history
  11. Merge branch 'main' into ampl/export-slack

    Pauline Jean-Marie committed Nov 10, 2023
    Configuration menu
    Copy the full SHA
    c8dd384 View commit details
    Browse the repository at this point in the history

Commits on Nov 15, 2023

  1. Use exporter id instead of AmplExportVersion enum name in properties …

    …for AmplExporter
    
    Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com>
    Pauline Jean-Marie committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    6d32105 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'ampl/export-slack' into ampl/extended-exporter

    Pauline Jean-Marie committed Nov 15, 2023
    Configuration menu
    Copy the full SHA
    3234db3 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    aa351b4 View commit details
    Browse the repository at this point in the history

Commits on Nov 16, 2023

  1. Remove duplicate version instantiation of columns exporter, now it is…

    … the instantiation in AmplExportConfig which is taken
    
    Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com>
    Pauline Jean-Marie committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    39c09d2 View commit details
    Browse the repository at this point in the history
  2. Update comments for javadoc

    Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com>
    Pauline Jean-Marie committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    5259117 View commit details
    Browse the repository at this point in the history
  3. Give a more specific name to the first columns extension

    Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com>
    Pauline Jean-Marie committed Nov 16, 2023
    Configuration menu
    Copy the full SHA
    8a64e54 View commit details
    Browse the repository at this point in the history

Commits on Nov 21, 2023

  1. Add ampl exporter version in ampl executor via AmplModelExecutionHand…

    …ler.parameters
    
    Signed-off-by: Pauline Jean-Marie <pauline.jean-marie@artelys.com>
    Pauline Jean-Marie committed Nov 21, 2023
    Configuration menu
    Copy the full SHA
    cfeaa23 View commit details
    Browse the repository at this point in the history

Commits on Nov 23, 2023

  1. Merge branch 'main' into ampl/export-slack

    Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com>
    olperr1 committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    1c16e45 View commit details
    Browse the repository at this point in the history
  2. Merge branch 'ampl/export-slack' into ampl/extended-exporter

    Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com>
    olperr1 committed Nov 23, 2023
    Configuration menu
    Copy the full SHA
    db125de View commit details
    Browse the repository at this point in the history

Commits on Nov 24, 2023

  1. Revert "fix MVar to MVAr"

    This reverts commit 96d8e90.
    
    Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com>
    olperr1 committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    d605507 View commit details
    Browse the repository at this point in the history
  2. Revert "fix MVar to MVAr"

    This reverts commit 4e1c694.
    
    Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com>
    olperr1 committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    26fb1ca View commit details
    Browse the repository at this point in the history
  3. Revert "fix constants typo"

    This reverts commit 39060bf.
    
    Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com>
    olperr1 committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    2dcdbf3 View commit details
    Browse the repository at this point in the history
  4. Merge branch 'main' into ampl/extended-exporter

    Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com>
    olperr1 committed Nov 24, 2023
    Configuration menu
    Copy the full SHA
    7f8baa3 View commit details
    Browse the repository at this point in the history

Commits on Dec 15, 2023

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

Commits on Jan 9, 2024

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

Commits on Jan 11, 2024

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

Commits on Sep 2, 2024

  1. Merge remote-tracking branch 'refs/remotes/origin/main' into ampl/ext…

    …ended-exporter
    
    # Conflicts:
    #	ampl-converter/src/test/java/com/powsybl/ampl/converter/AmplNetworkWriterTest.java
    #	ampl-executor/src/main/java/com/powsybl/ampl/executor/AmplModelExecutionHandler.java
    #	ampl-executor/src/main/java/com/powsybl/ampl/executor/AmplParameters.java
    p-arvy committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    74281b1 View commit details
    Browse the repository at this point in the history
  2. Refactor TUs

    Signed-off-by: p-arvy <pierre.arvy@artelys.com>
    p-arvy committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    ab37a56 View commit details
    Browse the repository at this point in the history
  3. Small refactor

    Signed-off-by: p-arvy <pierre.arvy@artelys.com>
    p-arvy committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    23141d9 View commit details
    Browse the repository at this point in the history
  4. Refactor table columns in extended ampl exporter

    Signed-off-by: p-arvy <pierre.arvy@artelys.com>
    p-arvy committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    626d1a2 View commit details
    Browse the repository at this point in the history
  5. Add slack bus export for 3wt, dangling lines and tie lines buses in e…

    …xtended ampl exporter
    
    Signed-off-by: p-arvy <pierre.arvy@artelys.com>
    p-arvy committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    906cd02 View commit details
    Browse the repository at this point in the history
  6. Add TUs for slack bus values in new extended ampl export

    Signed-off-by: p-arvy <pierre.arvy@artelys.com>
    p-arvy committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    a2fe2c3 View commit details
    Browse the repository at this point in the history
  7. Small clean

    Signed-off-by: p-arvy <pierre.arvy@artelys.com>
    p-arvy committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    c9c95c8 View commit details
    Browse the repository at this point in the history
  8. Fix G/B per unitage in new ampl extended export for tap changer tables

    Signed-off-by: p-arvy <pierre.arvy@artelys.com>
    p-arvy committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    2222f61 View commit details
    Browse the repository at this point in the history
  9. Configuration menu
    Copy the full SHA
    3f694eb View commit details
    Browse the repository at this point in the history
  10. Improve TUs on remote regulating terminal

    Signed-off-by: p-arvy <pierre.arvy@artelys.com>
    p-arvy committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    5c5e901 View commit details
    Browse the repository at this point in the history
  11. Add comment

    Signed-off-by: p-arvy <pierre.arvy@artelys.com>
    p-arvy committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    dfc89a4 View commit details
    Browse the repository at this point in the history
  12. Remove block of comments

    Signed-off-by: p-arvy <pierre.arvy@artelys.com>
    p-arvy committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    87d575e View commit details
    Browse the repository at this point in the history
  13. Add TU

    Signed-off-by: p-arvy <pierre.arvy@artelys.com>
    p-arvy committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    f1dd78e View commit details
    Browse the repository at this point in the history
  14. Fix unused import

    Signed-off-by: p-arvy <pierre.arvy@artelys.com>
    p-arvy committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    5619c2d View commit details
    Browse the repository at this point in the history
  15. Put extended version of the exporter as default version

    Signed-off-by: p-arvy <pierre.arvy@artelys.com>
    p-arvy committed Sep 2, 2024
    Configuration menu
    Copy the full SHA
    ba29e11 View commit details
    Browse the repository at this point in the history

Commits on Sep 5, 2024

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

Commits on Sep 11, 2024

  1. Update version of iidm extensions

    Signed-off-by: p-arvy <pierre.arvy@artelys.com>
    p-arvy committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    c6fc222 View commit details
    Browse the repository at this point in the history
  2. Remove properties override in TUs

    Signed-off-by: p-arvy <pierre.arvy@artelys.com>
    p-arvy committed Sep 11, 2024
    Configuration menu
    Copy the full SHA
    1e643c1 View commit details
    Browse the repository at this point in the history
  3. Configuration menu
    Copy the full SHA
    0327b6a View commit details
    Browse the repository at this point in the history

Commits on Sep 13, 2024

  1. initialize TableFormatterHelper

    Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
    rolnico committed Sep 13, 2024
    Configuration menu
    Copy the full SHA
    661e9c1 View commit details
    Browse the repository at this point in the history

Commits on Sep 16, 2024

  1. finish TableFormatterHelper

    Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
    rolnico committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    6e12d01 View commit details
    Browse the repository at this point in the history
  2. use record to lower number of method parameters

    Signed-off-by: Nicolas Rol <nicolas.rol@rte-france.com>
    rolnico committed Sep 16, 2024
    Configuration menu
    Copy the full SHA
    aafe76a View commit details
    Browse the repository at this point in the history

Commits on Sep 18, 2024

  1. Configuration menu
    Copy the full SHA
    59a30f2 View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    445c6ab View commit details
    Browse the repository at this point in the history

Commits on Sep 19, 2024

  1. Use index constants instead of their numeric values

    Signed-off-by: Olivier Perrin <olivier.perrin@rte-france.com>
    olperr1 committed Sep 19, 2024
    Configuration menu
    Copy the full SHA
    015b9ca View commit details
    Browse the repository at this point in the history

Commits on Sep 20, 2024

  1. Merge branch 'nro/ampl-extended-exporter-with-position' into ampl/ext…

    …ended-exporter
    
    Signed-off-by: Sophie Frasnedo <sophie.frasnedo@rte-france.com>
    So-Fras committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    fd0d55b View commit details
    Browse the repository at this point in the history
  2. Configuration menu
    Copy the full SHA
    4537070 View commit details
    Browse the repository at this point in the history
  3. Rename ExtendedAmplExporter

    Signed-off-by: p-arvy <pierre.arvy@artelys.com>
    p-arvy committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    7d60ce7 View commit details
    Browse the repository at this point in the history
  4. Modify extended ampl exporter javadoc

    Signed-off-by: p-arvy <pierre.arvy@artelys.com>
    p-arvy committed Sep 20, 2024
    Configuration menu
    Copy the full SHA
    6378899 View commit details
    Browse the repository at this point in the history