1
0
Fork 0
mirror of https://github.com/graphhopper/jsprit.git synced 2020-01-24 07:45:05 +01:00

POM and source updated to PTT version 2

This commit is contained in:
Balázs Vissy 2017-08-01 21:19:55 +02:00
parent 0e3f8461a6
commit 295d640995
4 changed files with 14 additions and 14 deletions

View file

@ -47,6 +47,11 @@
<artifactId>commons-csv</artifactId>
<version>1.4</version>
</dependency>
<dependency>
<groupId>hu.vissy.plain-text-table</groupId>
<artifactId>ptt-core</artifactId>
<version>${ptt.version}</version>
</dependency>
</dependencies>
</project>

View file

@ -239,7 +239,7 @@ public class RouteDetailsConfig extends ColumnConfigBase {
s.size = s.size.add(act.getLoadChange());
}
return s.size;
}, SizeDimensionAggregator::new, (s) -> null)).build());
}, SizeDimensionAggregator::new, (k, s) -> null)).build());
}
},
@ -297,7 +297,7 @@ public class RouteDetailsConfig extends ColumnConfigBase {
.getTransportTime(s.prevAct));
s.prevAct = act;
return val;
}, PrevActivityHolder::new, (s) -> null));
}, PrevActivityHolder::new, (k, s) -> null));
}
},
@ -332,7 +332,7 @@ public class RouteDetailsConfig extends ColumnConfigBase {
+ act.getOperationTime());
s.prevAct = act;
return val;
}, PrevActivityHolder::new, (s) -> null));
}, PrevActivityHolder::new, (k, s) -> null));
}
},
@ -426,7 +426,7 @@ public class RouteDetailsConfig extends ColumnConfigBase {
double res = r.getTransportCost(s.prevAct);
s.prevAct = act;
return (int) res;
}, PrevActivityHolder::new, (s) -> null));
}, PrevActivityHolder::new, (k, s) -> null));
}
},
@ -465,7 +465,7 @@ public class RouteDetailsConfig extends ColumnConfigBase {
}
s.cost += r.getActivityCost();
return s.cost;
}, CostAggregator::new, (s) -> null)
}, CostAggregator::new, (k, s) -> null)
).build());
}
},

View file

@ -151,7 +151,7 @@ public class SolutionPrinter2 {
agg.sum += val;
}
return val;
}, Aggregator::new, (agg) -> agg.sum))
}, Aggregator::new, (k, agg) -> agg.sum))
.build());
}
@ -239,8 +239,8 @@ public class SolutionPrinter2 {
TableFormatter<VehicleSummaryRecord> tableDef = builder.build();
List<VehicleSummaryRecord> data = solution.getRoutes().stream()
.map(r -> new VehicleSummaryRecord(r, problem))
.collect(Collectors.toList());
.map(r -> new VehicleSummaryRecord(r, problem))
.collect(Collectors.toList());
out.println(tableDef.apply(data));
}

View file

@ -78,7 +78,7 @@
<logger.version>1.7.21</logger.version>
<maven.javadoc.failOnError>false</maven.javadoc.failOnError>
<maven.version>3.3.0</maven.version>
<ptt.version>[1,2)</ptt.version>
<ptt.version>[2,3)</ptt.version>
</properties>
<build>
@ -178,11 +178,6 @@
<scope>test</scope>
</dependency>
<dependency>
<groupId>hu.vissy.plain-text-table</groupId>
<artifactId>ptt-core</artifactId>
<version>${ptt.version}</version>
</dependency>
</dependencies>