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

Jump to bottom

Bump org.matsim:matsim-all from 2025.0-2024w39 to 2025.0-2024w40 #75

Merged
merged 5 commits into from
Sep 30, 2024
Merged

Bump org.matsim:matsim-all from 2025.0-2024w39 to 2025.0-2024w40 #75

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
e3ccf4c
Bump org.matsim:matsim-all from 2025.0-2024w39 to 2025.0-2024w40
dependabot[bot] Sep 30, 2024
dfee702
fix test accordingly to changes on MATSim-libs
kt86 Sep 30, 2024
a24cc28
fix test accordingly to changes on MATSim-libs
kt86 Sep 30, 2024
352a707
cleanup code
kt86 Sep 30, 2024
e7d25be
fix test accordingly to changes on MATSim-libs
kt86 Sep 30, 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 @@
<parent>
<groupId>org.matsim</groupId>
<artifactId>matsim-all</artifactId>
<version>2025.0-2024w39</version>
<version>2025.0-2024w40</version>
<!-- <version>2025.0-PR3245</version>-->
<!-- <version>2025.0-SNAPSHOT</version>-->
<relativePath/>
Expand Down
1 change: 1 addition & 0 deletions src/main/java/org/matsim/vsp/DistanceConstraint/DistanceConstraintUtils.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -113,6 +113,7 @@ static VehicleRoutingTransportCostsMatrix createMatrix(VehicleRoutingProblem.Bui
VehicleRoutingProblemSolution bestSolution = Solutions.bestOf(solutions);
CarrierPlan carrierPlanServices = MatsimJspritFactory.createPlan(oneShipmentCarrier, bestSolution);
NetworkRouter.routePlan(carrierPlanServices, netBasedCostsMatrix);
oneShipmentCarrier.addPlan(carrierPlanServices);
oneShipmentCarrier.setSelectedPlan(carrierPlanServices);

for (ScheduledTour tour : carrierPlanServices.getScheduledTours()) {
Expand Down
72 changes: 36 additions & 36 deletions src/main/java/org/matsim/vsp/freight/RunFreight.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
import java.io.IOException;
import java.time.LocalDateTime;
import java.util.ArrayList;
import javax.management.InvalidAttributeValueException;

import com.graphhopper.jsprit.core.algorithm.VehicleRoutingAlgorithm;
import com.graphhopper.jsprit.core.algorithm.box.Jsprit;
Expand Down Expand Up @@ -90,12 +89,12 @@
public class RunFreight {

private static final Logger log = LogManager.getLogger(RunFreight.class);
private static final Level loggingLevel = Level.INFO; //Set to info to avoid all Debug-Messages, e.g. from VehicleRountingAlgorithm, but can be set to other values if needed. KMT feb/18.
private static final Level loggingLevel = Level.INFO; //Set to info to avoid all Debug-Messages, e.g. from VehicleRoutingAlgorithm, but can be set to other values if needed. KMT feb/18.

private enum CostsModififier {av, avFix110pct, avDist110pct, avVehCapUp}
private final static CostsModififier costsModififier = null;
private enum CostsModifier {av, avFix110pct, avDist110pct, avVehCapUp}
private final static CostsModifier costsModifier = null;

//Beginn Namesdefinition KT Für Berlin-Szenario
//Beginn Namesdefinition KT für Berlin-Szenario
private static final String INPUT_DIR = "scenarios/BerlinFood/";

private static final String OUTPUT_DIR = "scenarios/BerlinFood/output/Base_ServiceBased/" ;
Expand All @@ -118,7 +117,7 @@ private enum CostsModififier {av, avFix110pct, avDist110pct, avVehCapUp}

private static Config config;

public static void main(String[] args) throws IOException, InvalidAttributeValueException {
public static void main(String[] args) throws IOException {
LogManager.getRootLogger().atLevel(loggingLevel);
OutputDirectoryLogging.initLoggingWithOutputDirectory(LOG_DIR);

Expand Down Expand Up @@ -215,8 +214,8 @@ private static Carriers jspritRun(Config config, Network network) {

private static void modifyVehicleTypes(CarrierVehicleTypes vehicleTypes) {
for (VehicleType vt : vehicleTypes.getVehicleTypes().values()) {
if (costsModififier != null) {
switch (costsModififier) {
if (costsModifier != null) {
switch (costsModifier) {
case av:
vt.getCostInformation().setCostsPerSecond(0.0);
break;
Expand Down Expand Up @@ -282,7 +281,7 @@ private static void generateCarrierPlans(Network network, Carriers carriers, Car

VehicleRoutingAlgorithm vra = Jsprit.Builder.newInstance(vrp).setProperty(Jsprit.Parameter.THREADS, "5").buildAlgorithm();
vra.getAlgorithmListeners().addListener(new StopWatch(), Priority.HIGH);
// vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener(TEMP_DIR + RUN + runIndex + "jsprit_progress.png"));
// vra.getAlgorithmListeners().addListener(new AlgorithmSearchProgressChartListener(TEMP_DIR + RUN + runIndex + "jsprit_progress.png"));
vra.setMaxIterations(MAX_JSPRIT_ITERATION);
VehicleRoutingProblemSolution solution = Solutions.bestOf(vra.searchSolutions());

Expand All @@ -294,6 +293,7 @@ private static void generateCarrierPlans(Network network, Carriers carriers, Car

NetworkRouter.routePlan(newPlan,netBasedCosts) ;

carrier.addPlan(newPlan) ;
carrier.setSelectedPlan(newPlan) ;

//Plot der Jsprit-Lösung
Expand All @@ -311,26 +311,26 @@ private static void generateCarrierPlans(Network network, Carriers carriers, Car
* Falls nicht: log.warn und Ausgabe einer Datei: "#UnassignedServices.txt" mit den Service-Ids.
* @param carriers
*/
//TODO: Auch für Shipments auslegen und umbennnen. KMT feb'19
//TODO: Funktionaltität in contrib vorsehen -> CarrierControlerUtils? KMT feb'19
//TODO: Auch für Shipments auslegen und umbenennen. KMT feb'19
//TODO: Funktionalität in contrib vorsehen -> CarrierControlerUtils? KMT feb'19
private static void checkServiceAssignment(Carriers carriers) {
for (Carrier c :carriers.getCarriers().values()){
ArrayList<CarrierService> assignedServices = new ArrayList<>();
ArrayList<CarrierService> multiassignedServices = new ArrayList<>();
ArrayList<CarrierService> unassignedServices = new ArrayList<>();

log.info("### Check service assignements of Carrier: " +c.getId());
//Erfasse alle einer Tour zugehörigen (-> stattfindenden) Services
log.info("### Check service assignements of Carrier: {}", c.getId());
//Erfasse alle einer Tour zugehörigen (→ stattfindenden) Services
for (ScheduledTour tour : c.getSelectedPlan().getScheduledTours()){
for (TourElement te : tour.getTour().getTourElements()){
if (te instanceof ServiceActivity){
CarrierService assignedService = ((ServiceActivity) te).getService();
if (!assignedServices.contains(assignedService)){
assignedServices.add(assignedService);
log.debug("Assigned Service: " +assignedServices.toString());
log.debug("Assigned Service: {}", assignedServices);
} else {
multiassignedServices.add(assignedService);
log.warn("Service " + assignedService.getId().toString() + " has already been assigned to Carrier " + c.getId().toString() + " -> multiple Assignment!");
log.warn("Service {} has already been assigned to Carrier {} -> multiple Assignment!", assignedService.getId().toString(), c.getId().toString());
}
}
}
Expand All @@ -340,45 +340,45 @@ private static void checkServiceAssignment(Carriers carriers) {
for (CarrierService service : c.getServices().values()){
if (!assignedServices.contains(service)){
unassignedServices.add(service);
log.warn("Service " + service.getId().toString() +" will NOT be served by Carrier " + c.getId().toString());
log.warn("Service {} will NOT be served by Carrier {}", service.getId().toString(), c.getId().toString());
} else {
log.debug("Service was assigned: " +service.toString());
log.debug("Service was assigned: {}", service.toString());
}
}

//Schreibe die mehrfach eingeplanten Services in Datei
if (!multiassignedServices.isEmpty()){
try {
FileWriter writer = new FileWriter(config.controller().getOutputDirectory() + "#MultiAssignedServices.txt", true);
writer.write("#### Multi-assigned Services of Carrier: " + c.getId().toString() + System.getProperty("line.separator"));
writer.write("#### Multi-assigned Services of Carrier: " + c.getId().toString() + System.lineSeparator());
for (CarrierService s : multiassignedServices){
writer.write(s.getId().toString() + System.getProperty("line.separator"));
writer.write(s.getId().toString() + System.lineSeparator());
}
writer.flush();
writer.close();
} catch (IOException e) {
e.printStackTrace();
}
} else {
log.info("No service(s)of " + c.getId().toString() +" were assigned to a tour more then one times.");
log.info("No service(s)of {} were assigned to a tour more then one times.", c.getId().toString());
}


//Schreibe die nicht eingeplanten Services in Datei
if (!unassignedServices.isEmpty()){
try {
FileWriter writer = new FileWriter(config.controller().getOutputDirectory() + "#UnassignedServices.txt", true);
writer.write("#### Unassigned Services of Carrier: " + c.getId().toString() + System.getProperty("line.separator"));
writer.write("#### Unassigned Services of Carrier: " + c.getId().toString() + System.lineSeparator());
for (CarrierService s : unassignedServices){
writer.write(s.getId().toString() + System.getProperty("line.separator"));
writer.write(s.getId().toString() + System.lineSeparator());
}
writer.flush();
writer.close();
} catch (IOException e) {
e.printStackTrace();
}
} else {
log.info("All service(s) of " + c.getId().toString() +" were assigned to at least one tour");
log.info("All service(s) of {} were assigned to at least one tour", c.getId().toString());
}

}//for(carriers)
Expand Down Expand Up @@ -460,7 +460,7 @@ public ScoringFunction createScoringFunction(final Carrier carrier){

private static void writeAdditionalRunOutput(Config config, Carriers carriers) {
// ### some final output: ###
if (runMatsim){ //makes only sense, when MATSimrRun was performed KT 06.04.15
if (runMatsim){ //makes only sense, when MATSim run was performed KT 06.04.15
new WriteCarrierScoreInfos(carriers, new File(OUTPUT_DIR + "#MatsimCarrierScoreInformation.txt"));
}
new CarrierPlanWriter(carriers).write(config.controller().getOutputDirectory() + "/output_carriers.xml");
Expand All @@ -470,26 +470,26 @@ private static void writeAdditionalRunOutput(Config config, Carriers carriers) {
}

/**
* Write out the information about the datas provided for the simulation run.
* Write out the information about the data provided for the simulation run.
*/
private static void writeRunInfo() {
File file = new File(OUTPUT_DIR + "#RunInformation.txt");
try {
FileWriter writer = new FileWriter(file); //Neuer File (überschreibt im Zweifel den alten - der jedoch nicht existieren dürfte!
writer.write("System date and time writing this file: " + LocalDateTime.now() + System.getProperty("line.separator") + System.getProperty("line.separator"));
FileWriter writer = new FileWriter(file); //Neuer File (überschreibt im Zweifel den alten - der jedoch nicht existieren dürfte!)
writer.write("System date and time writing this file: " + LocalDateTime.now() + System.lineSeparator() + System.lineSeparator());

writer.write("##Inputfiles:" +System.getProperty("line.separator"));
writer.write("##Inputfiles:" + System.lineSeparator());
writer.write("Input-Directory: " + INPUT_DIR);
writer.write("Net: \t \t" + NETFILE_NAME +System.getProperty("line.separator"));
writer.write("Carrier: \t" + CARRIERFILE_NAME +System.getProperty("line.separator"));
writer.write("VehType: \t" + VEHTYPEFILE_NAME +System.getProperty("line.separator"));
writer.write("Net: \t \t" + NETFILE_NAME + System.lineSeparator());
writer.write("Carrier: \t" + CARRIERFILE_NAME + System.lineSeparator());
writer.write("VehType: \t" + VEHTYPEFILE_NAME + System.lineSeparator());
// writer.write("Algorithm: \t" + ALGORITHMFILE_NAME +System.getProperty("line.separator"));

writer.write(System.getProperty("line.separator"));
writer.write("##Run Settings:" +System.getProperty("line.separator"));
writer.write("runMatsim: \t \t" + runMatsim +System.getProperty("line.separator"));
writer.write("Last Matsim Iteration: \t" + LAST_MATSIM_ITERATION +System.getProperty("line.separator"));
writer.write("Max jsprit Iteration: \t" + MAX_JSPRIT_ITERATION +System.getProperty("line.separator"));
writer.write(System.lineSeparator());
writer.write("##Run Settings:" + System.lineSeparator());
writer.write("runMatsim: \t \t" + runMatsim + System.lineSeparator());
writer.write("Last Matsim Iteration: \t" + LAST_MATSIM_ITERATION + System.lineSeparator());
writer.write("Max jsprit Iteration: \t" + MAX_JSPRIT_ITERATION + System.lineSeparator());

writer.flush();
writer.close();
Expand Down
1 change: 1 addition & 0 deletions src/test/java/org/matsim/vsp/DistanceConstraint/TestRunDistanceConstraint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -558,6 +558,7 @@ private static void solveWithJsprit(Scenario scenario, Carriers carriers, int js
// Routing bestPlan to Network
CarrierPlan carrierPlanServices = MatsimJspritFactory.createPlan(singleCarrier, bestSolution);
NetworkRouter.routePlan(carrierPlanServices, netBasedCosts);
singleCarrier.addPlan(carrierPlanServices);
singleCarrier.setSelectedPlan(carrierPlanServices);

}
Expand Down