… | |
… | |
161 | struct route_graph_point *hash_next; /**< Pointer to a chained hashlist of all route_graph_points with this hash */ |
161 | struct route_graph_point *hash_next; /**< Pointer to a chained hashlist of all route_graph_points with this hash */ |
162 | struct route_graph_segment *start; /**< Pointer to a list of segments of which this point is the start. The links |
162 | struct route_graph_segment *start; /**< Pointer to a list of segments of which this point is the start. The links |
163 | * of this linked-list are in route_graph_segment->start_next.*/ |
163 | * of this linked-list are in route_graph_segment->start_next.*/ |
164 | struct route_graph_segment *end; /**< Pointer to a list of segments of which this pointer is the end. The links |
164 | struct route_graph_segment *end; /**< Pointer to a list of segments of which this pointer is the end. The links |
165 | * of this linked-list are in route_graph_segment->end_next. */ |
165 | * of this linked-list are in route_graph_segment->end_next. */ |
166 | struct route_graph_segment *seg; /**< Pointer to the segment one should use to reach the destination at |
166 | // struct route_graph_segment *seg; /**< Pointer to the segment one should use to reach the destination at |
167 | * least costs */ |
167 | // * least costs */ |
168 | struct fibheap_el *el; /**< When this point is put on a Fibonacci heap, this is a pointer |
168 | // struct fibheap_el *el; /**< When this point is put on a Fibonacci heap, this is a pointer |
169 | * to this point's heap-element */ |
169 | // * to this point's heap-element */ |
170 | int value; /**< The cost at which one can reach the destination from this point on */ |
170 | // int value; /**< The cost at which one can reach the destination from this point on */ |
171 | struct coord c; /**< Coordinates of this point */ |
171 | struct coord c; /**< Coordinates of this point */ |
172 | int flags; /**< Flags for this point (eg traffic distortion) */ |
172 | int flags; /**< Flags for this point (eg traffic distortion) */ |
173 | |
173 | |
174 | struct route_graph_segment *seg_rev; |
174 | // struct route_graph_segment *seg_rev; |
175 | |
175 | |
176 | /* |
176 | /* |
177 | Dijkstra values: |
177 | Dijkstra values: |
178 | ================ |
178 | ================ |
179 | seg -> what segment to use |
179 | seg -> what segment to use |
… | |
… | |
206 | struct route_graph_segment *end_next; /**< Pointer to the next element in the list of segments that end at the |
206 | struct route_graph_segment *end_next; /**< Pointer to the next element in the list of segments that end at the |
207 | * same point. Start of this list is in route_graph_point->end. */ |
207 | * same point. Start of this list is in route_graph_point->end. */ |
208 | struct route_graph_point *start; /**< Pointer to the point this segment starts at. */ |
208 | struct route_graph_point *start; /**< Pointer to the point this segment starts at. */ |
209 | struct route_graph_point *end; /**< Pointer to the point this segment ends at. */ |
209 | struct route_graph_point *end; /**< Pointer to the point this segment ends at. */ |
210 | |
210 | |
|
|
211 | |
211 | // -- NEW -- |
212 | // -- NEW -- |
212 | struct coord c_start_plus_1; // second coord |
213 | struct coord c_start_plus_1; // second coord |
213 | struct coord c_end_minus_1; // second to last coord |
214 | struct coord c_end_minus_1; // second to last coord |
214 | // -- NEW -- |
215 | // -- NEW -- |
|
|
216 | |
|
|
217 | |
|
|
218 | // -- NEW -- jandgr -- |
|
|
219 | int seg_start_out_cost; |
|
|
220 | int seg_end_out_cost; |
|
|
221 | struct route_graph_segment *start_from_seg; |
|
|
222 | struct route_graph_segment *end_from_seg; |
|
|
223 | struct fibheap_el *el_start; |
|
|
224 | struct fibheap_el *el_end; |
|
|
225 | // -- NEW -- jandgr -- |
|
|
226 | |
215 | |
227 | |
216 | struct route_segment_data data; /**< The segment data */ |
228 | struct route_segment_data data; /**< The segment data */ |
217 | }; |
229 | }; |
218 | |
230 | |
219 | |
231 | |