Skip to content

Commit

Permalink
checkstyle
Browse files Browse the repository at this point in the history
  • Loading branch information
hzoerner committed Jul 14, 2023
1 parent e3eeab8 commit 9ff2ba5
Showing 1 changed file with 6 additions and 7 deletions.
13 changes: 6 additions & 7 deletions src/main/java/org/matsim/prepare/counts/CreateCountsFromVMZ.java
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@
import org.apache.commons.csv.CSVPrinter;
import org.apache.logging.log4j.LogManager;
import org.apache.logging.log4j.Logger;
import org.apache.poi.ss.usermodel.Cell;
import org.apache.poi.ss.usermodel.Row;
import org.apache.poi.ss.usermodel.Sheet;
import org.apache.poi.xssf.usermodel.XSSFWorkbook;
Expand Down Expand Up @@ -84,9 +83,9 @@ public Integer call() throws Exception {
private void matchWithNetwork(Path network) throws TransformException, IOException {

/*
* TODO
* how to handle count station outside of berlin?
* */
* TODO
* how to handle count station outside of berlin?
* */

Network net;
{
Expand Down Expand Up @@ -128,18 +127,18 @@ private void matchWithNetwork(Path network) throws TransformException, IOExcepti

Map<Id<Link>, ? extends Link> links = net.getLinks();

for (var it = stations.entrySet().iterator(); it.hasNext();) {
for (var it = stations.entrySet().iterator(); it.hasNext(); ) {

Map.Entry<Integer, BerlinCount> next = it.next();
BerlinCount station = next.getValue();

if(counts.isIgnored(String.valueOf(next.getKey()))) {
if (counts.isIgnored(String.valueOf(next.getKey()))) {
it.remove();
continue;
}

Id<Link> manuallyMatched = counts.isManuallyMatched(String.valueOf(next.getKey()));
if(manuallyMatched != null && links.containsKey(manuallyMatched)){
if (manuallyMatched != null && links.containsKey(manuallyMatched)) {
station.linkId = manuallyMatched;
index.remove(links.get(manuallyMatched));
}
Expand Down

0 comments on commit 9ff2ba5

Please sign in to comment.