Commit Graph

88 Commits

Author SHA1 Message Date
e2332847cd Adjust priority in weight calculation with factor. 2023-04-23 14:50:45 +02:00
dca4d56866 Keep searching for the same amount of time already search to get shorter path. 2023-04-23 14:50:16 +02:00
5f6cccd17d Added priority queue with changable priority. 2023-04-23 14:49:09 +02:00
b89a3715a1 Created variable for maximum turn angle. 2023-04-23 14:47:26 +02:00
5b8a1d1e10 cleanup 2023-04-23 13:43:01 +02:00
7856f1c66c Changed factors to globalfields to reduce parametersin methodcall 2023-04-23 13:42:46 +02:00
97a057a3d4 Fixed gScore with MaxValue due to Vector Angle returning NaN 2023-04-23 13:41:22 +02:00
bc39785f6f Start of complete rethinking of Heuristic function and approach to get shortest path. 2023-04-23 13:11:52 +02:00
465d40a475 Cleanup variable rename 2023-04-23 12:58:32 +02:00
ed46a419e3 Moved fields for serialization. 2023-04-22 17:49:27 +02:00
a1d9ccad46 Added deserialization of PathResult 2023-04-21 18:35:02 +02:00
914731c8a3 Prevent other thread from changing collection /multithreading) 2023-04-21 18:34:49 +02:00
976108569b Threadsafe for masstesting variables. 2023-04-21 15:13:42 +02:00
c43c6dc985 Cleanup
Added "sequential read" to fileoptions on deserialization.
2023-04-21 14:44:18 +02:00
aa8b1e4451 Inverse Angle 2023-04-21 14:28:02 +02:00
cd3905915b Cleanup 2023-04-21 13:43:50 +02:00
dd37430761 Moved RoadPriority Function to RegionManager 2023-04-21 13:41:01 +02:00
42e915ee05 Added distance and duration to PathResult. 2023-04-21 11:40:26 +02:00
7d769a064f Parallel reading of regionfiles. 2023-04-21 11:40:15 +02:00
750ba5c624 Fixed angle calculation 2023-04-21 11:01:31 +02:00
1facca84ba Prevent multiple processes from reading same file. 2023-04-21 11:01:05 +02:00
7201b9c993 Add turn-angle to Weight calculation.
For that added Vector-class.
Highways now have much higher priority.
2023-04-21 00:42:21 +02:00
2b252e2b06 Cleanup of unnecessary code 2023-04-20 23:02:38 +02:00
d456275fc1 private field naming _cameFromDict 2023-04-20 22:58:50 +02:00
2bd6c5d9c4 Replaced local vars with fields. 2023-04-20 22:58:27 +02:00
90a09e84c5 Removed/Replaced unnecessary checks in AStar. 2023-04-20 22:53:23 +02:00
946fa0206b Made Pathfinder non-static to enable field-usage in other methods/classes.
Added fields RegionManager, workingDirectory, PathResult (result of AStar), gScore (result of AStar). Fields later used in Renderer.

SaveGraph is now called SaveResult and serializes PathResult as JSON.
2023-04-20 19:39:18 +02:00
5a1dce9883 PathResult now only includes Path and calcTime.
Other fields have been moved to Pathfinder
2023-04-20 19:37:34 +02:00
208c000577 Changed values for heuristic and weight functions, as well as increased priority for type1-roads (motorways). 2023-04-19 22:51:47 +02:00
5212e43897 Add regionManager to PathResult for internal use 2023-04-19 22:15:57 +02:00
6fb88b5c9c Include RegionManager in result for internal use 2023-04-19 22:15:43 +02:00
9e0c4f65db appropriate names in PathResult for nodes gSCoreNodes 2023-04-19 22:02:15 +02:00
055a751c9d Save Pathfinding result to file.
Load result for render.
2023-04-13 19:18:25 +02:00
d35aab9c39 More logging 2023-04-13 01:12:16 +02:00
08e3da6fe3 Render result to png after every routing 2023-04-13 01:00:56 +02:00
308579279b Working. Weight calculation is still wonky, as well as heuristic needing tuning. 2023-04-11 01:04:19 +02:00
2131ac4afe Still requires tuning 2023-04-10 01:33:18 +02:00
874d60992e Try improving priority 2023-04-09 22:10:58 +02:00
c1557b7678 cleanup 2023-04-09 22:10:41 +02:00
5289020d44 correct node for closest. 2023-04-09 21:02:32 +02:00
9e72d50448 Fixed valid start and end nodes (for type) 2023-04-09 21:02:01 +02:00
c238a9eed3 Implemented "smart" routing through priority:
Factors:
speed,
roadtype,
junctions / waychanges.
2023-04-09 20:41:33 +02:00
6e836db79b changed speeds and return type to byte 2023-04-09 19:22:34 +02:00
9448187452 Added checks if item already in queue, only update direct-distance if it not already calculated. 2023-04-09 19:22:21 +02:00
2ca4207fd7 renamed currentNode 2023-04-09 18:37:45 +02:00
0f53ae579c Made speedtype any generic.
Will use any connection (highway), and return the same speed for all highways.
2023-04-09 18:27:53 +02:00
d8f8a41dcc Renamed PathNode distance and weight to include "delta".
Added directDistanceDelta
2023-04-09 17:52:37 +02:00
6eab23ff16 bug: forgot to exchange from distance to weight during copy & paste 2023-04-09 17:47:45 +02:00
206f9c5811 Added weight and distance delta to pathnode 2023-04-09 17:46:35 +02:00
e0bb3ce3de Added Method for path-return (returns the path from current graph).
Added "tags" to return value for path.
2023-04-09 17:38:57 +02:00