Commit 1b927755 by 张晓

算法读取批次部分合并

1 parent 998c16f9
...@@ -69,12 +69,12 @@ public class Location { ...@@ -69,12 +69,12 @@ public class Location {
/** /**
* time to the given location in minutes. * time to the given location in minutes.
* FIXME 这里简化处理没有用时间矩阵 时间=距离/100 *
* @param location other location * @param location other location
* @return time in minutes * @return time in minutes
*/ */
public int getPathTimeTo(Location location) { public int getPathTimeTo(Location location) {
return (int)(distanceMap.get(location)/100); return distanceTimeMap.get(location).intValue();
} }
// ************************************************************************ // ************************************************************************
...@@ -97,4 +97,5 @@ public class Location { ...@@ -97,4 +97,5 @@ public class Location {
return this.id == ((Location) obj).getId(); return this.id == ((Location) obj).getId();
} }
} }
...@@ -195,5 +195,18 @@ public class Technician { ...@@ -195,5 +195,18 @@ public class Technician {
return this.id == ((Technician) obj).getId(); return this.id == ((Technician) obj).getId();
} }
@Override
public String toString() {
return "Technician{" +
"id=" + id +
", code='" + code + '\'' +
", depot=" + depot +
", startTime=" + startTime +
", endTime=" + endTime +
", skills=" + skills +
", maxCount=" + maxCount +
", maxMinute=" + maxMinute +
", maxDistanceMeter=" + maxDistanceMeter +
'}';
}
} }
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!