Skip to content

Commit 24d11a5

Browse files
committed
Merge branch 'main' into fix/timecoupled_constraint
2 parents b97fdc1 + eee7f49 commit 24d11a5

43 files changed

Lines changed: 2283 additions & 896 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

data/crac/crac-util/pom.xml

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,12 @@
6363
<artifactId>open-rao-crac-io-json</artifactId>
6464
<scope>test</scope>
6565
</dependency>
66+
<dependency>
67+
<groupId>${project.groupId}</groupId>
68+
<artifactId>open-rao-ics-importer</artifactId>
69+
<version>${project.version}</version>
70+
<scope>test</scope>
71+
</dependency>
6672
<dependency>
6773
<groupId>com.powsybl</groupId>
6874
<artifactId>powsybl-config-test</artifactId>
@@ -83,5 +89,6 @@
8389
<artifactId>assertj-core</artifactId>
8490
<scope>test</scope>
8591
</dependency>
92+
8693
</dependencies>
8794
</project>

data/crac/crac-util/src/main/java/com/powsybl/openrao/data/crac/util/IcsImporter.java

Lines changed: 0 additions & 469 deletions
This file was deleted.

data/crac/crac-util/src/test/java/com/powsybl/openrao/data/crac/util/IcsImporterTest.java

Lines changed: 0 additions & 393 deletions
This file was deleted.

data/crac/crac-util/src/test/resources/ics/series_gradient_not_ok.csv

Lines changed: 0 additions & 4 deletions
This file was deleted.

data/crac/crac-util/src/test/resources/ics/series_no_pmin_rd.csv

Lines changed: 0 additions & 4 deletions
This file was deleted.

data/crac/crac-util/src/test/resources/ics/static_no_startup.csv

Lines changed: 0 additions & 2 deletions
This file was deleted.

data/crac/crac-util/src/test/resources/ics/static_shutdown_startup_true.csv

Lines changed: 0 additions & 2 deletions
This file was deleted.

data/crac/crac-util/src/test/resources/ics/static_with_gsk_no_shutdown.csv

Lines changed: 0 additions & 2 deletions
This file was deleted.

data/crac/crac-util/src/test/resources/ics/static_with_gsk_no_startup.csv

Lines changed: 0 additions & 2 deletions
This file was deleted.

data/crac/crac-util/src/test/resources/ics/static_with_gsk_wrong_shutdown.csv

Lines changed: 0 additions & 2 deletions
This file was deleted.

0 commit comments

Comments
 (0)