Skip to content

Commit

Permalink
Merge branch 'master' into traveltime_cleanup
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrieser
mrieser authored Oct 11, 2023
2 parents 7e07e6c + f90ef2a commit e7951cd
Show file tree
Hide file tree
Showing 73 changed files with 1,486 additions and 297 deletions.
23 changes: 19 additions & 4 deletions contribs/dvrp/src/main/java/org/matsim/contrib/zone/skims/TravelTimeMatrices.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
/*
* Copyright (C) Schweizerische Bundesbahnen SBB, 2018.
*/

/* *********************************************************************** *
* project: org.matsim.* *
*
* *
* *********************************************************************** *
* *
* copyright : (C) 2023 by the members listed in the COPYING, *
* LICENSE and WARRANTY file. *
* email : info at matsim dot org *
* *
* *********************************************************************** *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* See also COPYING, LICENSE and WARRANTY file *
* *
* *********************************************************************** */
package org.matsim.contrib.zone.skims;

import java.util.ArrayList;
Expand Down
23 changes: 19 additions & 4 deletions contribs/sbb-extensions/src/main/java/ch/sbb/matsim/RunSBBExtension.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
/*
* Copyright (C) Schweizerische Bundesbahnen SBB, 2018.
*/

/* *********************************************************************** *
* project: org.matsim.* *
*
* *
* *********************************************************************** *
* *
* copyright : (C) 2023 by the members listed in the COPYING, *
* LICENSE and WARRANTY file. *
* email : info at matsim dot org *
* *
* *********************************************************************** *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* See also COPYING, LICENSE and WARRANTY file *
* *
* *********************************************************************** */
package ch.sbb.matsim;

import ch.sbb.matsim.mobsim.qsim.SBBTransitModule;
Expand Down
23 changes: 19 additions & 4 deletions ...ribs/sbb-extensions/src/main/java/ch/sbb/matsim/analysis/skims/BeelineDistanceMatrix.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
/*
* Copyright (C) Schweizerische Bundesbahnen SBB, 2018.
*/

/* *********************************************************************** *
* project: org.matsim.* *
*
* *
* *********************************************************************** *
* *
* copyright : (C) 2023 by the members listed in the COPYING, *
* LICENSE and WARRANTY file. *
* email : info at matsim dot org *
* *
* *********************************************************************** *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* See also COPYING, LICENSE and WARRANTY file *
* *
* *********************************************************************** */
package ch.sbb.matsim.analysis.skims;

import java.util.Map;
Expand Down
25 changes: 20 additions & 5 deletions ...ribs/sbb-extensions/src/main/java/ch/sbb/matsim/analysis/skims/CalculateSkimMatrices.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
/*
* Copyright (C) Schweizerische Bundesbahnen SBB, 2018.
*/

/* *********************************************************************** *
* project: org.matsim.* *
*
* *
* *********************************************************************** *
* *
* copyright : (C) 2023 by the members listed in the COPYING, *
* LICENSE and WARRANTY file. *
* email : info at matsim dot org *
* *
* *********************************************************************** *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* See also COPYING, LICENSE and WARRANTY file *
* *
* *********************************************************************** */
package ch.sbb.matsim.analysis.skims;

import ch.sbb.matsim.analysis.skims.NetworkSkimMatrices.NetworkIndicators;
Expand Down Expand Up @@ -175,7 +190,7 @@ public static void main(String[] args) throws IOException {
"",
(line, route) -> route.getTransportMode().equals("train"));
}

skims.calculateAndWriteBeelineMatrix();
}

Expand Down
23 changes: 19 additions & 4 deletions contribs/sbb-extensions/src/main/java/ch/sbb/matsim/analysis/skims/FloatMatrix.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
/*
* Copyright (C) Schweizerische Bundesbahnen SBB, 2018.
*/

/* *********************************************************************** *
* project: org.matsim.* *
*
* *
* *********************************************************************** *
* *
* copyright : (C) 2023 by the members listed in the COPYING, *
* LICENSE and WARRANTY file. *
* email : info at matsim dot org *
* *
* *********************************************************************** *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* See also COPYING, LICENSE and WARRANTY file *
* *
* *********************************************************************** */
package ch.sbb.matsim.analysis.skims;

import java.util.Arrays;
Expand Down
23 changes: 19 additions & 4 deletions contribs/sbb-extensions/src/main/java/ch/sbb/matsim/analysis/skims/FloatMatrixIO.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
/*
* Copyright (C) Schweizerische Bundesbahnen SBB, 2018.
*/

/* *********************************************************************** *
* project: org.matsim.* *
*
* *
* *********************************************************************** *
* *
* copyright : (C) 2023 by the members listed in the COPYING, *
* LICENSE and WARRANTY file. *
* email : info at matsim dot org *
* *
* *********************************************************************** *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* See also COPYING, LICENSE and WARRANTY file *
* *
* *********************************************************************** */
package ch.sbb.matsim.analysis.skims;

import java.io.BufferedReader;
Expand Down
23 changes: 19 additions & 4 deletions contribs/sbb-extensions/src/main/java/ch/sbb/matsim/analysis/skims/MatricesToXY.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
/*
* Copyright (C) Schweizerische Bundesbahnen SBB, 2018.
*/

/* *********************************************************************** *
* project: org.matsim.* *
*
* *
* *********************************************************************** *
* *
* copyright : (C) 2023 by the members listed in the COPYING, *
* LICENSE and WARRANTY file. *
* email : info at matsim dot org *
* *
* *********************************************************************** *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* See also COPYING, LICENSE and WARRANTY file *
* *
* *********************************************************************** */
package ch.sbb.matsim.analysis.skims;

import java.io.BufferedWriter;
Expand Down
23 changes: 19 additions & 4 deletions contribs/sbb-extensions/src/main/java/ch/sbb/matsim/analysis/skims/NetworkSkimMatrices.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
/*
* Copyright (C) Schweizerische Bundesbahnen SBB, 2018.
*/

/* *********************************************************************** *
* project: org.matsim.* *
*
* *
* *********************************************************************** *
* *
* copyright : (C) 2023 by the members listed in the COPYING, *
* LICENSE and WARRANTY file. *
* email : info at matsim dot org *
* *
* *********************************************************************** *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* See also COPYING, LICENSE and WARRANTY file *
* *
* *********************************************************************** */
package ch.sbb.matsim.analysis.skims;

import org.matsim.core.router.speedy.SpeedyGraph;
Expand Down
19 changes: 19 additions & 0 deletions contribs/sbb-extensions/src/main/java/ch/sbb/matsim/analysis/skims/PTSkimMatrices.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/* *********************************************************************** *
* project: org.matsim.* *
*
* *
* *********************************************************************** *
* *
* copyright : (C) 2023 by the members listed in the COPYING, *
* LICENSE and WARRANTY file. *
* email : info at matsim dot org *
* *
* *********************************************************************** *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* See also COPYING, LICENSE and WARRANTY file *
* *
* *********************************************************************** */
package ch.sbb.matsim.analysis.skims;

import ch.sbb.matsim.analysis.skims.RooftopUtils.ODConnection;
Expand Down
19 changes: 19 additions & 0 deletions contribs/sbb-extensions/src/main/java/ch/sbb/matsim/analysis/skims/RooftopUtils.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/* *********************************************************************** *
* project: org.matsim.* *
*
* *
* *********************************************************************** *
* *
* copyright : (C) 2023 by the members listed in the COPYING, *
* LICENSE and WARRANTY file. *
* email : info at matsim dot org *
* *
* *********************************************************************** *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* See also COPYING, LICENSE and WARRANTY file *
* *
* *********************************************************************** */
package ch.sbb.matsim.analysis.skims;

import ch.sbb.matsim.routing.pt.raptor.SwissRailRaptorCore.TravelInfo;
Expand Down
19 changes: 19 additions & 0 deletions contribs/sbb-extensions/src/main/java/ch/sbb/matsim/analysis/skims/StreamingFacilities.java
View file
Original file line number Diff line number Diff line change
@@ -1,3 +1,22 @@
/* *********************************************************************** *
* project: org.matsim.* *
*
* *
* *********************************************************************** *
* *
* copyright : (C) 2023 by the members listed in the COPYING, *
* LICENSE and WARRANTY file. *
* email : info at matsim dot org *
* *
* *********************************************************************** *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* See also COPYING, LICENSE and WARRANTY file *
* *
* *********************************************************************** */
package ch.sbb.matsim.analysis.skims;

import org.matsim.api.core.v01.Id;
Expand Down
25 changes: 20 additions & 5 deletions contribs/sbb-extensions/src/main/java/ch/sbb/matsim/config/SBBTransitConfigGroup.java
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,22 @@
/*
* Copyright (C) Schweizerische Bundesbahnen SBB, 2018.
*/

/* *********************************************************************** *
* project: org.matsim.* *
*
* *
* *********************************************************************** *
* *
* copyright : (C) 2023 by the members listed in the COPYING, *
* LICENSE and WARRANTY file. *
* email : info at matsim dot org *
* *
* *********************************************************************** *
* *
* This program is free software; you can redistribute it and/or modify *
* it under the terms of the GNU General Public License as published by *
* the Free Software Foundation; either version 2 of the License, or *
* (at your option) any later version. *
* See also COPYING, LICENSE and WARRANTY file *
* *
* *********************************************************************** */
package ch.sbb.matsim.config;

import java.util.HashSet;
Expand All @@ -20,7 +35,7 @@ public class SBBTransitConfigGroup extends ReflectiveConfigGroup {
static private final String PARAM_DETERMINISTIC_SERVICE_MODES = "deterministicServiceModes";
static private final String PARAM_CREATE_LINK_EVENTS_INTERVAL = "createLinkEventsInterval";

private Set<String> deterministicServiceModes = new HashSet<>();
private final Set<String> deterministicServiceModes = new HashSet<>();
private int createLinkEventsInterval = 0;

public SBBTransitConfigGroup() {
Expand Down
Loading

0 comments on commit e7951cd

Please sign in to comment.