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

Bump the java-dependencies group with 20 updates #1097

Merged
merged 2 commits into from
Mar 26, 2024
Merged

Bump the java-dependencies group with 20 updates #1097

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7ef9ef8
Bump the java-dependencies group with 20 updates
dependabot[bot] Mar 25, 2024
73a0a9d
Adapt to changes in matsim-libs#3165: "EventsFileComparator.Result" h…
kt86 Mar 26, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
Therefore we need to use a fixed value here and then refer to the matsim version with ${project.parent.version} -->
<!-- Options: stable build based on weekly (e.g. 15.0-PR2344), PR-based (e.g. 15.0-2023w01) or official (e.g. 14.0) releases -->
<!-- <version>16.0-2024w02</version>-->
<version>16.0-2024w12</version>
<version>16.0-2024w13</version>
<!--<version>15.0-SNAPSHOT</version>-->
<!-- <version>16.0-SNAPSHOT</version>-->
<relativePath/>
Expand Down
4 changes: 2 additions & 2 deletions src/main/java/org/matsim/codeexamples/extensions/freight/RunFreightExample.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,11 +49,11 @@ public static void run( String[] args, boolean runWithOTFVis ) throws ExecutionE
if ( args==null || args.length==0 || args[0]==null ){
config = ConfigUtils.loadConfig( IOUtils.extendUrl( ExamplesUtils.getTestScenarioURL( "freight-chessboard-9x9" ), "config.xml" ) );
config.plans().setInputFile( null ); // remove passenger input
config.controller().setOutputDirectory( "./output/freight" );
config.controller().setOutputDirectory( "./output/freight_services" );
config.controller().setLastIteration( 0 ); // no iterations; for iterations see RunFreightWithIterationsExample. kai, jan'23

FreightCarriersConfigGroup freightConfigGroup = ConfigUtils.addOrGetModule( config, FreightCarriersConfigGroup.class );
freightConfigGroup.setCarriersFile("singleCarrierFiveActivitiesWithoutRoutes_Shipments.xml");
freightConfigGroup.setCarriersFile("singleCarrierFiveActivitiesWithoutRoutes.xml");
freightConfigGroup.setCarriersVehicleTypesFile( "vehicleTypes.xml" );
} else {
config = ConfigUtils.loadConfig( args, new FreightCarriersConfigGroup() );
Expand Down
5 changes: 3 additions & 2 deletions src/test/java/org/matsim/codeexamples/extensions/freight/RunFreightExampleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.matsim.core.utils.io.IOUtils;
import org.matsim.examples.ExamplesUtils;
import org.matsim.testcases.MatsimTestUtils;
import org.matsim.utils.eventsfilecomparison.ComparisonResult;
import org.matsim.utils.eventsfilecomparison.EventsFileComparator;

public class RunFreightExampleTest{
Expand Down Expand Up @@ -42,8 +43,8 @@ void testMain(){
{
String expected = utils.getInputDirectory() + "/output_events.xml.gz";
String actual = utils.getOutputDirectory() + "/output_events.xml.gz";
EventsFileComparator.Result result = EventsUtils.compareEventsFiles( expected, actual );
Assertions.assertEquals( EventsFileComparator.Result.FILES_ARE_EQUAL, result );
ComparisonResult result = EventsUtils.compareEventsFiles( expected, actual );
Assertions.assertEquals( ComparisonResult.FILES_ARE_EQUAL, result );
}

} catch( Exception ee ){
Expand Down
5 changes: 3 additions & 2 deletions .../java/org/matsim/codeexamples/extensions/freight/RunFreightWithIterationsExampleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,7 @@
import org.matsim.core.utils.io.IOUtils;
import org.matsim.examples.ExamplesUtils;
import org.matsim.testcases.MatsimTestUtils;
import org.matsim.utils.eventsfilecomparison.ComparisonResult;
import org.matsim.utils.eventsfilecomparison.EventsFileComparator;

import java.net.URL;
Expand Down Expand Up @@ -44,8 +45,8 @@ void testMain(){
{
String expected = utils.getInputDirectory() + "/output_events.xml.gz";
String actual = utils.getOutputDirectory() + "/output_events.xml.gz";
EventsFileComparator.Result result = EventsUtils.compareEventsFiles( expected, actual );
Assertions.assertEquals( EventsFileComparator.Result.FILES_ARE_EQUAL, result );
ComparisonResult result = EventsUtils.compareEventsFiles( expected, actual );
Assertions.assertEquals( ComparisonResult.FILES_ARE_EQUAL, result );
}

} catch( Exception ee ){
Expand Down
5 changes: 3 additions & 2 deletions ...deexamples/programming/simpleadaptivesignalengine/RunSimpleAdaptiveSignalExampleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@

import org.matsim.codeexamples.mobsim.simpleAdaptiveSignalEngine.RunSimpleAdaptiveSignalExample;
import org.matsim.testcases.MatsimTestUtils;
import org.matsim.utils.eventsfilecomparison.ComparisonResult;
import org.matsim.utils.eventsfilecomparison.EventsFileComparator;

/**
Expand All @@ -44,8 +45,8 @@ void testRunSimpleAdaptiveSignalExample(){
// compare event files
final String expected = testUtils.getClassInputDirectory() + "output_events.xml.gz";
final String actual = testUtils.getOutputDirectory() + "output_events.xml.gz";
EventsFileComparator.Result result = EventsFileComparator.compare(expected, actual);

ComparisonResult result = EventsFileComparator.compare(expected, actual);
System.out.println("result of events file comparison=" + result.name() ) ;

// Assert.assertEquals("different event files",
Expand Down
3 changes: 2 additions & 1 deletion src/test/java/org/matsim/codeexamples/scoring/aaAddToScoring/RunAddToScoringExampleTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import org.matsim.core.utils.io.IOUtils;
import org.matsim.examples.ExamplesUtils;
import org.matsim.testcases.MatsimTestUtils;
import org.matsim.utils.eventsfilecomparison.ComparisonResult;
import org.matsim.utils.eventsfilecomparison.EventsFileComparator;

import static org.junit.jupiter.api.Assertions.fail;
Expand All @@ -34,7 +35,7 @@ void testMain(){
String expected = utils.getInputDirectory() + "/output_events.xml.gz" ;
String actual = utils.getOutputDirectory() + "/output_events.xml.gz" ;
var result = EventsUtils.compareEventsFiles( expected, actual );
Assertions.assertEquals( EventsFileComparator.Result.FILES_ARE_EQUAL, result);
Assertions.assertEquals( ComparisonResult.FILES_ARE_EQUAL, result);
}
{
final Population expected = PopulationUtils.createPopulation( ConfigUtils.createConfig() );
Expand Down
Loading