Skip to content

Commit

Permalink
Merge branch 'main' into feature/timestamp-in-crac-api
Browse files Browse the repository at this point in the history
  • Loading branch information
bqth29 authored Feb 12, 2025
2 parents 7b47772 + af32a6d commit 08eb1cc
Show file tree
Hide file tree
Showing 4 changed files with 4 additions and 4 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ private RaoResultJsonConstants() {
public static final String VERSION = "version";
public static final String INFO = "info";
public static final String RAO_RESULT_TYPE = "RAO_RESULT";
public static final String RAO_RESULT_INFO = "Generated by Open RAO http://farao-community.github.io";
public static final String RAO_RESULT_INFO = "Generated by Open RAO https://powsybl.readthedocs.io/projects/openrao";

public static final String CONTINGENCY_ID = "contingency";

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"type" : "RAO_RESULT",
"version" : "1.7",
"info" : "Generated by Open RAO http://farao-community.github.io",
"info" : "Generated by Open RAO https://powsybl.readthedocs.io/projects/openrao",
"computationStatus" : "default",
"executionDetails" : "The RAO only went through first preventive",
"costResults" : {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@
public class CracImportSteps {

private static final double DOUBLE_TOLERANCE = 1e-1;
private static final String NOT_IMPLEMENTED_JSON = "This step is not implemented for farao-native crac import";
private static final String NOT_IMPLEMENTED_JSON = "This step is not implemented for open-rao-native crac import";
private static final String NOT_IMPLEMENTED_FB = "This step is not implemented for FbConstraintCreationContext";
private static final String TYPE_NOT_HANDLED = "%s type is not handled";
private Crac crac;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ public static Network importNetwork(File networkFile, boolean useRdfId) {

public static Pair<Crac, CracCreationContext> importCrac(File cracFile, Network network, String timestamp, CracCreationParameters cracCreationParameters) throws IOException {
if (cracFile.getName().endsWith(".json")) {
// for now, the only JSON format is the farao internal format
// for now, the only JSON format is the open rao internal format
return Pair.of(importCracFromInternalFormat(cracFile, network), null);
} else {
CracCreationContext ccc = importCracFromNativeCrac(cracFile, network, timestamp, cracCreationParameters);
Expand Down

0 comments on commit 08eb1cc

Please sign in to comment.