Skip to content

Commit dc95092

Browse files
CorinStavesCorinStaves
committed
Resolving some MATSim version conflict issues (now using 12 instead of 11)
1 parent 5ddfdae commit dc95092

12 files changed

Lines changed: 29 additions & 41 deletions

File tree

‎analysis/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,7 +215,6 @@
215215
<svnRevision>${buildNumber}</svnRevision>
216216
<geotools.version>13.0</geotools.version>
217217
<skipTestJar>false</skipTestJar> <!--Overridden in the bintray profile-->
218-
<matsimVersion>0.10.0-SNAPSHOT</matsimVersion>
219218
<jackson.version>2.9.5</jackson.version>
220219
</properties>
221220
</project>

‎extensions/matsim2silo/src/main/java/de/tum/bgu/msm/matsim/MatsimData.java‎

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
import de.tum.bgu.msm.container.DataContainer;
66
import de.tum.bgu.msm.data.Zone;
77
import de.tum.bgu.msm.properties.Properties;
8+
import org.matsim.api.core.v01.Scenario;
89
import org.matsim.api.core.v01.TransportMode;
910
import org.matsim.api.core.v01.network.Network;
1011
import org.matsim.core.config.Config;
@@ -18,6 +19,7 @@
1819
import org.matsim.core.router.util.LeastCostPathCalculatorFactory;
1920
import org.matsim.core.router.util.TravelDisutility;
2021
import org.matsim.core.router.util.TravelTime;
22+
import org.matsim.core.scenario.ScenarioUtils;
2123
import org.matsim.pt.transitSchedule.api.TransitSchedule;
2224

2325
import java.util.Collection;
@@ -135,8 +137,9 @@ MultiNodePathCalculator createFreeSpeedMultiNodePathCalculator() {
135137
TripRouter createTripRouter() {
136138
final RoutingModule carRoutingModule;
137139
if (config.plansCalcRoute().isInsertingAccessEgressWalk()) {
140+
Scenario scenario = ScenarioUtils.createScenario(config);
138141
carRoutingModule = DefaultRoutingModules.createAccessEgressNetworkRouter(
139-
TransportMode.car, PopulationUtils.getFactory(), carNetwork, leastCostPathCalculatorFactory.createPathCalculator(carNetwork, travelDisutility, travelTime), config.plansCalcRoute());
142+
TransportMode.car, leastCostPathCalculatorFactory.createPathCalculator(carNetwork, travelDisutility, travelTime), scenario, carNetwork, DefaultRoutingModules.createTeleportationRouter(TransportMode.walk, scenario, config.plansCalcRoute().getOrCreateModeRoutingParams(TransportMode.walk)));
140143
} else {
141144
carRoutingModule = DefaultRoutingModules.createPureNetworkRouter(
142145
TransportMode.car, PopulationUtils.getFactory(), carNetwork, leastCostPathCalculatorFactory.createPathCalculator(carNetwork, travelDisutility, travelTime));
@@ -145,7 +148,7 @@ TripRouter createTripRouter() {
145148

146149
if (schedule != null && config.transit().isUseTransit()) {
147150
final RoutingModule teleportationRoutingModule = DefaultRoutingModules.createTeleportationRouter(
148-
TransportMode.walk, PopulationUtils.getFactory(), config.plansCalcRoute().getOrCreateModeRoutingParams(TransportMode.walk));
151+
TransportMode.walk, ScenarioUtils.createScenario(config), config.plansCalcRoute().getOrCreateModeRoutingParams(TransportMode.walk));
149152
final SwissRailRaptor swissRailRaptor = createSwissRailRaptor(RaptorStaticConfig.RaptorOptimization.OneToOneRouting);
150153
ptRoutingModule = new SwissRailRaptorRoutingModule(swissRailRaptor, schedule, ptNetwork, teleportationRoutingModule);
151154
} else {
@@ -176,7 +179,7 @@ LeastCostPathCalculator createLeastCostPathCalculator() {
176179

177180
RoutingModule getTeleportationRouter(String mode) {
178181
return DefaultRoutingModules.createTeleportationRouter(
179-
mode, PopulationUtils.getFactory(), config.plansCalcRoute().getOrCreateModeRoutingParams(mode));
182+
mode, ScenarioUtils.createScenario(config), config.plansCalcRoute().getOrCreateModeRoutingParams(mode));
180183
}
181184

182185
SwissRailRaptorData getRaptorData(RaptorStaticConfig.RaptorOptimization optimization) {

‎extensions/matsim2silo/src/main/java/de/tum/bgu/msm/matsim/MatsimSkimCreator.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -186,7 +186,7 @@ public IndexedDoubleMatrix2D createTeleportedSkim(Collection<Zone> zones, String
186186

187187
if (!planElements.isEmpty()) {
188188
final Leg lastLeg = (Leg) planElements.get(planElements.size() - 1);
189-
arrivalTime = lastLeg.getDepartureTime() + lastLeg.getTravelTime();
189+
arrivalTime = lastLeg.getDepartureTime().seconds() + lastLeg.getTravelTime().seconds();
190190
}
191191

192192
double time = arrivalTime - peakHour_s;

‎extensions/matsim2silo/src/main/java/de/tum/bgu/msm/matsim/MatsimTravelTimesAndCosts.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ public double getTravelTime(Location origin, Location destination, double timeOf
130130

131131
if (!planElements.isEmpty()) {
132132
final Leg lastLeg = (Leg) planElements.get(planElements.size() - 1);
133-
arrivalTime = lastLeg.getDepartureTime() + lastLeg.getTravelTime();
133+
arrivalTime = lastLeg.getDepartureTime().seconds() + lastLeg.getTravelTime().seconds();
134134
}
135135

136136
double time = arrivalTime - timeOfDay_s;
@@ -157,10 +157,10 @@ public double getGeneralizedTravelCosts(Location origin, Location destination, d
157157
} else if (routingModule instanceof SwissRailRaptorRoutingModule || routingModule instanceof FreespeedFactorRoutingModule) {
158158
for (PlanElement pe : planElements) {
159159
if (pe instanceof Leg) {
160-
double time = ((Leg) pe).getTravelTime();
160+
double time = ((Leg) pe).getTravelTime().orElse(-1);
161161

162162
// overrides individual parameters per person; use default scoring parameters
163-
if (Time.getUndefinedTime() != time) {
163+
if (time >= 0) {
164164
utility += time * (cnScoringGroup.getModes().get(mode).getMarginalUtilityOfTraveling() - cnScoringGroup.getPerforming_utils_hr()) / 3600;
165165
}
166166
Double dist = ((Leg) pe).getRoute().getDistance();

‎extensions/matsim2silo/src/main/java/de/tum/bgu/msm/matsim/accessibility/AccessibilityModule.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,9 +13,7 @@
1313
import org.matsim.api.core.v01.Scenario;
1414
import org.matsim.api.core.v01.network.Network;
1515
import org.matsim.api.core.v01.network.Node;
16-
import org.matsim.contrib.accessibility.AccessibilityAttributes;
1716
import org.matsim.contrib.accessibility.AccessibilityConfigGroup;
18-
import org.matsim.contrib.accessibility.interfaces.FacilityDataExchangeInterface;
1917
import org.matsim.core.config.ConfigUtils;
2018
import org.matsim.core.config.groups.FacilitiesConfigGroup;
2119
import org.matsim.core.controler.Controler;
@@ -68,7 +66,8 @@ public void prepareAccessibility(Scenario scenario, Controler controler) {
6866
final ActivityFacilities opportunities = scenario.getActivityFacilities();
6967
int i = 0;
7068
for (ActivityFacility activityFacility : zoneRepresentativeCoords.getFacilities().values()) {
71-
activityFacility.getAttributes().putAttribute(AccessibilityAttributes.WEIGHT, zonePopulationMap.get(activityFacility.getId()));
69+
//TODO: re-implement accessibility module matsim
70+
// activityFacility.getAttributes().putAttribute(AccessibilityAttributes.WEIGHT, zonePopulationMap.get(activityFacility.getId()));
7271
opportunities.addActivityFacility(activityFacility);
7372
i++;
7473
}
@@ -108,7 +107,8 @@ public void prepareAccessibility(Scenario scenario, Controler controler) {
108107
// Accessibility module
109108

110109
org.matsim.contrib.accessibility.AccessibilityModule module = new org.matsim.contrib.accessibility.AccessibilityModule();
111-
module.addFacilityDataExchangeListener((FacilityDataExchangeInterface) dataContainer.getAccessibility());
110+
//TODO: re-implement accessiblity module
111+
// module.addFacilityDataExchangeListener((FacilityDataExchangeInterface) dataContainer.getAccessibility());
112112
controler.addOverridingModule(module);
113113
// End accessibility module
114114
}

‎extensions/matsim2silo/src/main/java/de/tum/bgu/msm/matsim/accessibility/MatsimAccessibility.java‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
import org.apache.log4j.Logger;
99
import org.jfree.util.Log;
1010
import org.matsim.api.core.v01.Id;
11-
import org.matsim.contrib.accessibility.interfaces.FacilityDataExchangeInterface;
11+
//import org.matsim.contrib.accessibility.interfaces.FacilityDataExchangeInterface;
1212
import org.matsim.core.utils.collections.Tuple;
1313
import org.matsim.facilities.ActivityFacility;
1414

@@ -20,7 +20,7 @@
2020
/**
2121
* @author dziemke
2222
**/
23-
public class MatsimAccessibility implements Accessibility, FacilityDataExchangeInterface {
23+
public class MatsimAccessibility implements Accessibility {
2424
private static final Logger logger = Logger.getLogger(MatsimAccessibility.class);
2525

2626
private final GeoData geoData;
@@ -36,14 +36,14 @@ public MatsimAccessibility(GeoData geoData) {
3636
}
3737

3838
// FacilityDataExchangeInterface methods
39-
@Override
39+
// @Override
4040
public void setFacilityAccessibilities(ActivityFacility measurePoint, Double timeOfDay, Map<String, Double> accessibilities){
4141
if (timeOfDay == 8 * 60. * 60.) { // TODO Find better way for this check
4242
accessibilitiesMap.put(new Tuple<ActivityFacility, Double>(measurePoint, timeOfDay), accessibilities);
4343
}
4444
}
4545

46-
@Override
46+
// @Override
4747
public void finish() { }
4848

4949
// Accessibility interface methods

‎extensions/pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -219,7 +219,7 @@
219219
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
220220
<skipTestJar>false</skipTestJar> <!--Overridden in the bintray profile-->
221221
<jackson.version>2.9.5</jackson.version>
222-
<matsimVersion>11.0</matsimVersion>
222+
<matsimVersion>12.0</matsimVersion>
223223
</properties>
224224

225225

‎siloCore/pom.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -375,7 +375,7 @@
375375
<dependency>
376376
<groupId>com.github.msmobility</groupId>
377377
<artifactId>mito</artifactId>
378-
<version>v28102020</version>
378+
<version>master</version>
379379
<exclusions>
380380
<exclusion>
381381
<groupId>javax.media</groupId>
@@ -416,7 +416,7 @@
416416
<svnRevision>${buildNumber}</svnRevision>
417417
<geotools.version>20.2</geotools.version>
418418
<skipTestJar>false</skipTestJar> <!--Overridden in the bintray profile-->
419-
<matsimVersion>11.0</matsimVersion>
419+
<matsimVersion>12.0</matsimVersion>
420420
<java.version>1.8</java.version>
421421
<maven.compiler.source>1.8</maven.compiler.source>
422422
<maven.compiler.target>1.8</maven.compiler.target>

‎siloCore/src/main/java/de/tum/bgu/msm/utils/SiloUtil.java‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,7 @@
1212
import omx.OmxMatrix;
1313
import omx.hdf5.OmxHdf5Datatype;
1414
import org.apache.commons.lang3.SystemUtils;
15-
import org.apache.log4j.Appender;
16-
import org.apache.log4j.FileAppender;
17-
import org.apache.log4j.Level;
18-
import org.apache.log4j.Logger;
15+
import org.apache.log4j.*;
1916
import org.matsim.core.controler.Controler;
2017

2118
import java.io.*;
@@ -72,10 +69,10 @@ public static Properties siloInitialization(String propertiesPath) {
7269
*/
7370
private static void initLogging(String outputDirectory) throws IOException {
7471
Logger root = Logger.getRootLogger();
75-
FileAppender appender = new FileAppender(Controler.DEFAULTLOG4JLAYOUT, outputDirectory + System.getProperty("file.separator")+ LOG_FILE_NAME, false);
72+
FileAppender appender = new FileAppender(new SimpleLayout(), outputDirectory + System.getProperty("file.separator")+ LOG_FILE_NAME, false);
7673
appender.setName(LOG_FILE_NAME);
7774
root.addAppender(appender);
78-
FileAppender warnErrorAppender = new FileAppender(Controler.DEFAULTLOG4JLAYOUT, outputDirectory + System.getProperty("file.separator")+ LOG_WARN_FILE_NAME, false);
75+
FileAppender warnErrorAppender = new FileAppender(new SimpleLayout(), outputDirectory + System.getProperty("file.separator")+ LOG_WARN_FILE_NAME, false);
7976
warnErrorAppender.setName(LOG_WARN_FILE_NAME);
8077
warnErrorAppender.setThreshold(Level.WARN);
8178
root.addAppender(warnErrorAppender);

‎synthetic-population/pom.xml‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -227,7 +227,6 @@
227227
<svnRevision>${buildNumber}</svnRevision>
228228
<geotools.version>13.0</geotools.version>
229229
<skipTestJar>false</skipTestJar> <!--Overridden in the bintray profile-->
230-
<matsimVersion>0.10.0-SNAPSHOT</matsimVersion>
231230
<jackson.version>2.9.5</jackson.version>
232231
</properties>
233232
</project>

0 commit comments

Comments
 (0)