From 1022f40e26d1a273a8f28d685c36de197307b19e Mon Sep 17 00:00:00 2001
From: oblonski <4sschroeder@gmail.com>
Date: Tue, 4 Nov 2014 16:18:23 +0100
Subject: [PATCH] refine VehicleImpl.toString() and VehicleTypeImpl.toString()

---
 .../core/problem/vehicle/VehicleImpl.java      | 18 ++++++++++++------
 .../core/problem/vehicle/VehicleTypeImpl.java  | 14 ++++++++------
 2 files changed, 20 insertions(+), 12 deletions(-)

diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleImpl.java b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleImpl.java
index 947ea632..8a376796 100644
--- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleImpl.java
+++ b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleImpl.java
@@ -1,16 +1,16 @@
 /*******************************************************************************
- * Copyright (C) 2013  Stefan Schroeder
- * 
+ * Copyright (C) 2014  Stefan Schroeder
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either 
+ * License as published by the Free Software Foundation; either
  * version 3.0 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public 
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
@@ -309,7 +309,13 @@ public class VehicleImpl extends AbstractVehicle{
 	 */
 	@Override
 	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
diff --git a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleTypeImpl.java b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleTypeImpl.java
index b2d3bcb1..1a4f77fa 100644
--- a/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleTypeImpl.java
+++ b/jsprit-core/src/main/java/jsprit/core/problem/vehicle/VehicleTypeImpl.java
@@ -1,16 +1,16 @@
 /*******************************************************************************
- * Copyright (C) 2013  Stefan Schroeder
- * 
+ * Copyright (C) 2014  Stefan Schroeder
+ *
  * This library is free software; you can redistribute it and/or
  * modify it under the terms of the GNU Lesser General Public
- * License as published by the Free Software Foundation; either 
+ * License as published by the Free Software Foundation; either
  * version 3.0 of the License, or (at your option) any later version.
- * 
+ *
  * This library is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
  * Lesser General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU Lesser General Public 
  * License along with this library.  If not, see <http://www.gnu.org/licenses/>.
  ******************************************************************************/
@@ -269,7 +269,9 @@ public class VehicleTypeImpl implements VehicleType {
 
 	@Override
 	public String toString() {
-		return "[typeId="+typeId+"][capacity="+capacity+"]" + vehicleCostParams;
+        return "[typeId="+typeId+"]" +
+                "[capacity="+capacityDimensions+"]" +
+                "[costs=" + vehicleCostParams + "]";
 	}
 
 	@Override