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

Merge branch 'master' into json

This commit is contained in:
oblonski 2014-11-04 16:19:45 +01:00
commit 86d4e60b96
2 changed files with 20 additions and 12 deletions

View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (C) 2013 Stefan Schroeder * Copyright (C) 2014 Stefan Schroeder
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -309,7 +309,13 @@ public class VehicleImpl extends AbstractVehicle{
*/ */
@Override @Override
public String toString() { public String toString() {
return "[id="+id+"][type="+type+"][locationId="+locationId+"][coord=" + coord + "][isReturnToDepot=" + isReturnToDepot() + "]"; return "[id="+id+"]" +
"[type="+type+"]" +
"[startLocationId="+startLocationId+"]" +
"[startLocationCoordinate=" + startLocationCoord + "]" +
"[endLocationId=" + endLocationId+"]" +
"[endLocationCoordinate=" + endLocationCoord + "]" +
"[isReturnToDepot=" + isReturnToDepot() + "]";
} }
@Override @Override

View file

@ -1,5 +1,5 @@
/******************************************************************************* /*******************************************************************************
* Copyright (C) 2013 Stefan Schroeder * Copyright (C) 2014 Stefan Schroeder
* *
* This library is free software; you can redistribute it and/or * This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public * modify it under the terms of the GNU Lesser General Public
@ -269,7 +269,9 @@ public class VehicleTypeImpl implements VehicleType {
@Override @Override
public String toString() { public String toString() {
return "[typeId="+typeId+"][capacity="+capacity+"]" + vehicleCostParams; return "[typeId="+typeId+"]" +
"[capacity="+capacityDimensions+"]" +
"[costs=" + vehicleCostParams + "]";
} }
@Override @Override