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.

Sign up for GitHub

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

Delete crac-creator package #1100

Merged
merged 9 commits into from
Aug 1, 2024
Merged

Delete crac-creator package #1100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
08ff9ef
Delete crac-creator package
bqth29 Jul 31, 2024
3967e4c
Update doc
bqth29 Jul 31, 2024
6b90d59
Mutualize in cracio common
bqth29 Jul 31, 2024
ce9915b
Fix issues on auto generated XSD classes
bqth29 Aug 1, 2024
125845b
Remove old dependencies
bqth29 Aug 1, 2024
e029707
common -> commons
bqth29 Aug 1, 2024
ebc1565
common -> commons
bqth29 Aug 1, 2024
8799472
Merge branch 'main' into remove-crac-creator
bqth29 Aug 1, 2024
978d11a
Merge branch 'main' into remove-crac-creator
pet-mit Aug 1, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
54 changes: 0 additions & 54 deletions data/crac-creation/crac-creator-api/pom.xml
View file
Open in desktop

This file was deleted.

Empty file removed data/crac-creation/crac-creator-api/src/test/resources/empty.txt
View file
Open in desktop
Empty file.
11 changes: 0 additions & 11 deletions data/crac-creation/crac-creator-cse/src/test/resources/logback-test.xml
View file
Open in desktop

This file was deleted.

34 changes: 0 additions & 34 deletions data/crac-creation/pom.xml
View file
Open in desktop

This file was deleted.

13 changes: 4 additions & 9 deletions data/crac-creation/crac-creator-cim/pom.xml → data/crac-io/crac-io-cim/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,13 +10,13 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<parent>
<artifactId>open-rao-crac-creation</artifactId>
<artifactId>open-rao-crac-io</artifactId>
<groupId>com.powsybl</groupId>
<version>6.1.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

<artifactId>open-rao-crac-creator-cim</artifactId>
<artifactId>open-rao-crac-io-cim</artifactId>
<name>CRAC creator - SWE zone</name>
<description>CRAC creator implementation for CRAC specific to SWE zone format</description>
<packaging>jar</packaging>
Expand Down Expand Up @@ -44,7 +44,7 @@
<artifactId>maven-javadoc-plugin</artifactId>
<configuration>
<excludePackageNames>
com.powsybl.openrao.data.craccreation.creator.cim.xsd.*:com.powsybl.openrao.data.craccreation.creator.cim.xsd:eu.entsoe.*
com.powsybl.openrao.data.cracio.cim.xsd.*:com.powsybl.openrao.data.cracio.cim.xsd:eu.entsoe.*
</excludePackageNames>
</configuration>
</plugin>
Expand All @@ -54,12 +54,7 @@
<dependencies>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>open-rao-crac-creator-api</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
<artifactId>open-rao-crac-creation-util</artifactId>
<artifactId>open-rao-crac-io-commons</artifactId>
<version>${project.version}</version>
</dependency>
<dependency>
Expand Down
8 changes: 4 additions & 4 deletions ...or/AdditionalConstraintSeriesCreator.java → ...or/AdditionalConstraintSeriesCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,16 +5,16 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

package com.powsybl.openrao.data.craccreation.creator.cim.craccreator;
package com.powsybl.openrao.data.cracio.cim.craccreator;

import com.powsybl.openrao.commons.Unit;
import com.powsybl.openrao.data.cracapi.Crac;
import com.powsybl.openrao.data.cracapi.InstantKind;
import com.powsybl.openrao.data.cracapi.cnec.AngleCnec;
import com.powsybl.openrao.data.cracapi.cnec.AngleCnecAdder;
import com.powsybl.openrao.data.craccreation.creator.api.ImportStatus;
import com.powsybl.openrao.data.craccreation.creator.cim.xsd.AdditionalConstraintRegisteredResource;
import com.powsybl.openrao.data.craccreation.creator.cim.xsd.AdditionalConstraintSeries;
import com.powsybl.openrao.data.cracio.commons.api.ImportStatus;
import com.powsybl.openrao.data.cracio.cim.xsd.AdditionalConstraintRegisteredResource;
import com.powsybl.openrao.data.cracio.cim.xsd.AdditionalConstraintSeries;
import com.powsybl.iidm.network.Network;

import java.util.Objects;
Expand Down
6 changes: 3 additions & 3 deletions ...craccreator/AngleCnecCreationContext.java → ...craccreator/AngleCnecCreationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

package com.powsybl.openrao.data.craccreation.creator.cim.craccreator;
package com.powsybl.openrao.data.cracio.cim.craccreator;

import com.powsybl.openrao.data.craccreation.creator.api.ElementaryCreationContext;
import com.powsybl.openrao.data.craccreation.creator.api.ImportStatus;
import com.powsybl.openrao.data.cracio.commons.api.ElementaryCreationContext;
import com.powsybl.openrao.data.cracio.commons.api.ImportStatus;

/**
* @author Godelaine de Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
Expand Down
2 changes: 1 addition & 1 deletion ...creator/cim/craccreator/CimConstants.java → .../cracio/cim/craccreator/CimConstants.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

package com.powsybl.openrao.data.craccreation.creator.cim.craccreator;
package com.powsybl.openrao.data.cracio.cim.craccreator;

import java.util.List;
import java.util.Objects;
Expand Down
6 changes: 3 additions & 3 deletions ...reator/CimContingencyCreationContext.java → ...reator/CimContingencyCreationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

package com.powsybl.openrao.data.craccreation.creator.cim.craccreator;
package com.powsybl.openrao.data.cracio.cim.craccreator;

import com.powsybl.openrao.data.craccreation.creator.api.ElementaryCreationContext;
import com.powsybl.openrao.data.craccreation.creator.api.ImportStatus;
import com.powsybl.openrao.data.cracio.commons.api.ElementaryCreationContext;
import com.powsybl.openrao.data.cracio.commons.api.ImportStatus;

/**
* @author Godelaine de Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
Expand Down
19 changes: 10 additions & 9 deletions ...im/craccreator/CimContingencyCreator.java → ...im/craccreator/CimContingencyCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,24 +5,25 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

package com.powsybl.openrao.data.craccreation.creator.cim.craccreator;
package com.powsybl.openrao.data.cracio.cim.craccreator;

import com.powsybl.contingency.ContingencyElement;
import com.powsybl.contingency.ContingencyElementType;
import com.powsybl.iidm.network.DanglingLine;
import com.powsybl.iidm.network.TieLine;
import com.powsybl.openrao.data.cracapi.ContingencyAdder;
import com.powsybl.openrao.data.cracapi.Crac;
import com.powsybl.openrao.data.craccreation.creator.api.ImportStatus;
import com.powsybl.openrao.data.craccreation.creator.cim.xsd.*;
import com.powsybl.openrao.data.cracio.commons.api.ImportStatus;
import com.powsybl.iidm.network.Identifiable;
import com.powsybl.iidm.network.Network;
import com.powsybl.openrao.data.craccreation.util.cgmes.CgmesBranchHelper;
import com.powsybl.openrao.data.cracio.commons.cgmes.CgmesBranchHelper;
import com.powsybl.openrao.data.cracio.cim.xsd.ContingencyRegisteredResource;
import com.powsybl.openrao.data.cracio.cim.xsd.ContingencySeries;
import com.powsybl.openrao.data.cracio.cim.xsd.Series;
import com.powsybl.openrao.data.cracio.cim.xsd.TimeSeries;

import java.util.*;

import static com.powsybl.openrao.data.craccreation.creator.cim.craccreator.CimConstants.*;

/**
* @author Godelaine de Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
*/
Expand Down Expand Up @@ -122,8 +123,8 @@ private Identifiable<?> getNetworkElementInNetwork(String networkElementIdInCrac
}

private boolean describesContingencyToImport(Series series) {
return series.getBusinessType().equals(CONTINGENCY_SERIES_BUSINESS_TYPE)
|| series.getBusinessType().equals(CNECS_SERIES_BUSINESS_TYPE)
|| series.getBusinessType().equals(REMEDIAL_ACTIONS_SERIES_BUSINESS_TYPE);
return series.getBusinessType().equals(CimConstants.CONTINGENCY_SERIES_BUSINESS_TYPE)
|| series.getBusinessType().equals(CimConstants.CNECS_SERIES_BUSINESS_TYPE)
|| series.getBusinessType().equals(CimConstants.REMEDIAL_ACTIONS_SERIES_BUSINESS_TYPE);
}
}
4 changes: 2 additions & 2 deletions ...m/craccreator/CimCracCreationContext.java → ...m/craccreator/CimCracCreationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

package com.powsybl.openrao.data.craccreation.creator.cim.craccreator;
package com.powsybl.openrao.data.cracio.cim.craccreator;

import com.powsybl.openrao.data.cracapi.Crac;
import com.powsybl.openrao.data.cracapi.CracCreationContext;
import com.powsybl.openrao.data.cracapi.CracCreationReport;
import com.powsybl.openrao.data.craccreation.creator.api.ElementaryCreationContext;
import com.powsybl.openrao.data.cracio.commons.api.ElementaryCreationContext;

import java.time.OffsetDateTime;
import java.util.*;
Expand Down
10 changes: 5 additions & 5 deletions ...eator/cim/craccreator/CimCracCreator.java → ...racio/cim/craccreator/CimCracCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,17 +5,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

package com.powsybl.openrao.data.craccreation.creator.cim.craccreator;
package com.powsybl.openrao.data.cracio.cim.craccreator;

import com.powsybl.iidm.network.Network;
import com.powsybl.openrao.data.cracapi.Crac;
import com.powsybl.openrao.data.cracapi.InstantKind;
import com.powsybl.iidm.network.TwoSides;
import com.powsybl.openrao.data.cracapi.parameters.CracCreationParameters;
import com.powsybl.openrao.data.craccreation.creator.cim.parameters.CimCracCreationParameters;
import com.powsybl.openrao.data.craccreation.creator.cim.xsd.CRACMarketDocument;
import com.powsybl.openrao.data.craccreation.creator.cim.xsd.TimeSeries;
import com.powsybl.openrao.data.craccreation.util.RaUsageLimitsAdder;
import com.powsybl.openrao.data.cracio.cim.xsd.CRACMarketDocument;
import com.powsybl.openrao.data.cracio.cim.parameters.CimCracCreationParameters;
import com.powsybl.openrao.data.cracio.cim.xsd.TimeSeries;
import com.powsybl.openrao.data.cracio.commons.RaUsageLimitsAdder;
import com.powsybl.openrao.data.cracutil.CracValidator;

import java.time.OffsetDateTime;
Expand Down
4 changes: 2 additions & 2 deletions ...ator/cim/craccreator/CimCracImporter.java → ...acio/cim/craccreator/CimCracImporter.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,15 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

package com.powsybl.openrao.data.craccreation.creator.cim.craccreator;
package com.powsybl.openrao.data.cracio.cim.craccreator;

import com.google.auto.service.AutoService;
import com.powsybl.iidm.network.Network;
import com.powsybl.openrao.commons.OpenRaoException;
import com.powsybl.openrao.data.cracapi.CracCreationContext;
import com.powsybl.openrao.data.cracapi.io.Importer;
import com.powsybl.openrao.data.cracapi.parameters.CracCreationParameters;
import com.powsybl.openrao.data.craccreation.creator.cim.xsd.CRACMarketDocument;
import com.powsybl.openrao.data.cracio.cim.xsd.CRACMarketDocument;
import org.apache.commons.io.FilenameUtils;
import org.xml.sax.SAXException;

Expand Down
9 changes: 7 additions & 2 deletions ...creator/cim/craccreator/CimCracUtils.java → .../cracio/cim/craccreator/CimCracUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,17 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

package com.powsybl.openrao.data.craccreation.creator.cim.craccreator;
package com.powsybl.openrao.data.cracio.cim.craccreator;

import com.powsybl.openrao.commons.OpenRaoException;
import com.powsybl.contingency.Contingency;
import com.powsybl.openrao.data.cracapi.cnec.FlowCnec;
import com.powsybl.openrao.data.craccreation.creator.cim.xsd.*;
import com.powsybl.openrao.data.cracio.cim.xsd.*;
import com.powsybl.openrao.data.cracio.cim.xsd.Point;
import com.powsybl.openrao.data.cracio.cim.xsd.ContingencySeries;
import com.powsybl.openrao.data.cracio.cim.xsd.MonitoredSeries;
import com.powsybl.openrao.data.cracio.cim.xsd.SeriesPeriod;
import com.powsybl.openrao.data.cracio.cim.xsd.TimeSeries;
import org.apache.commons.lang3.StringUtils;

import java.time.Duration;
Expand Down
4 changes: 2 additions & 2 deletions .../cim/craccreator/CnecCreationContext.java → .../cim/craccreator/CnecCreationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

package com.powsybl.openrao.data.craccreation.creator.cim.craccreator;
package com.powsybl.openrao.data.cracio.cim.craccreator;

import com.powsybl.openrao.data.craccreation.creator.api.ImportStatus;
import com.powsybl.openrao.data.cracio.commons.api.ImportStatus;

/**
* @author Godelaine de Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
Expand Down
16 changes: 8 additions & 8 deletions ...m/craccreator/HvdcRangeActionCreator.java → ...m/craccreator/HvdcRangeActionCreator.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

package com.powsybl.openrao.data.craccreation.creator.cim.craccreator;
package com.powsybl.openrao.data.cracio.cim.craccreator;

import com.powsybl.openrao.commons.OpenRaoException;
import com.powsybl.contingency.Contingency;
import com.powsybl.openrao.data.cracapi.Crac;
import com.powsybl.openrao.data.cracapi.cnec.AngleCnec;
import com.powsybl.openrao.data.cracapi.cnec.FlowCnec;
import com.powsybl.openrao.data.cracapi.rangeaction.HvdcRangeActionAdder;
import com.powsybl.openrao.data.craccreation.creator.api.ImportStatus;
import com.powsybl.openrao.data.craccreation.util.OpenRaoImportException;
import com.powsybl.openrao.data.craccreation.creator.cim.parameters.CimCracCreationParameters;
import com.powsybl.openrao.data.craccreation.creator.cim.parameters.RangeActionSpeed;
import com.powsybl.openrao.data.craccreation.creator.cim.xsd.RemedialActionRegisteredResource;
import com.powsybl.openrao.data.craccreation.creator.cim.xsd.RemedialActionSeries;
import com.powsybl.openrao.data.cracio.commons.api.ImportStatus;
import com.powsybl.openrao.data.cracio.commons.OpenRaoImportException;
import com.powsybl.openrao.data.cracio.cim.parameters.CimCracCreationParameters;
import com.powsybl.openrao.data.cracio.cim.parameters.RangeActionSpeed;
import com.powsybl.openrao.data.cracio.cim.xsd.RemedialActionRegisteredResource;
import com.powsybl.openrao.data.cracio.cim.xsd.RemedialActionSeries;
import com.powsybl.iidm.network.Country;
import com.powsybl.iidm.network.HvdcLine;
import com.powsybl.iidm.network.Network;
Expand All @@ -29,7 +29,7 @@
import java.util.*;
import java.util.stream.Collectors;

import static com.powsybl.openrao.data.craccreation.creator.cim.craccreator.CimConstants.MEGAWATT_UNIT_SYMBOL;
import static com.powsybl.openrao.data.cracio.cim.craccreator.CimConstants.MEGAWATT_UNIT_SYMBOL;

/**
* @author Godelaine de Montmorillon {@literal <godelaine.demontmorillon at rte-france.com>}
Expand Down
4 changes: 2 additions & 2 deletions ...accreator/MeasurementCreationContext.java → ...accreator/MeasurementCreationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,10 +5,10 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

package com.powsybl.openrao.data.craccreation.creator.cim.craccreator;
package com.powsybl.openrao.data.cracio.cim.craccreator;

import com.powsybl.openrao.data.cracapi.Instant;
import com.powsybl.openrao.data.craccreation.creator.api.ImportStatus;
import com.powsybl.openrao.data.cracio.commons.api.ImportStatus;
import org.apache.commons.collections4.keyvalue.MultiKey;
import org.apache.commons.collections4.map.MultiKeyMap;

Expand Down
4 changes: 2 additions & 2 deletions ...eator/MonitoredSeriesCreationContext.java → ...eator/MonitoredSeriesCreationContext.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,9 +5,9 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*/

package com.powsybl.openrao.data.craccreation.creator.cim.craccreator;
package com.powsybl.openrao.data.cracio.cim.craccreator;

import com.powsybl.openrao.data.craccreation.creator.api.ImportStatus;
import com.powsybl.openrao.data.cracio.commons.api.ImportStatus;

import java.util.LinkedHashSet;
import java.util.Objects;
Expand Down
Loading
Loading