Commit Graph

103 Commits (5b226adc759e195a5cedc91dbeef3180102af938)

Author SHA1 Message Date
Jonathan G Rennison 560a049316 Linkgraph GUI: Replace line visibility detection algorithm
Previous algorithm had excessive false-positive rate
7 years ago
Jonathan G Rennison 29470dba23 LinkGraph: Increase caching of link graph lines/point details 7 years ago
Jonathan G Rennison cd68e9fac7 Linkgraph: Do not pre-fill annos set at start of MCF Dijkstra 7 years ago
Jonathan G Rennison 4a420ef864 Linkgraph: Use cached value in capacity annotation comparison 7 years ago
Jonathan G Rennison 3f83546dfc Linkgraph: Fix numeric overflow in cost estimate/duration multiplier.
Bump cost estimate type to 64 bits
7 years ago
Jonathan G Rennison 52dadc9252 Merge branch 'master' into jgrpp 7 years ago
frosch 1e50edd12c (svn r27887) -Cleanup: Remove unused/unimplemented prototype (adf88) 7 years ago
Jonathan G Rennison 7e89b9789f Linkgraph: Fix divide by 0 error when total linkgraph cost estimate <= 1. 8 years ago
Jonathan G Rennison 117b56caeb Linkgraph: Replace a std::list with a std::vector. 8 years ago
Jonathan G Rennison c86a027e88 Linkgraph: Use an arena allocator for path objects.
Fixes leaks when job is aborted early.
8 years ago
Jonathan G Rennison 3f2c561867 Linkgraph: Add support for aborting MCF passes early. 8 years ago
Jonathan G Rennison 2080daab8d Linkgraph: Refactoring to avoid manual deletes. 8 years ago
Jonathan G Rennison 28211c21fc Linkgraph: Fix a memory leak when aborting job early. 8 years ago
Jonathan G Rennison 9d5f34fea6 Replace various uses of std::set/map with btree containers. 8 years ago
Jonathan G Rennison 375dbdbfe1 Linkgraph: Allow job threads to be aborted early when clearing schedule. 8 years ago
Jonathan G Rennison d08d1cbd67 Linkgraph: Avoid attempting to merge/apply job when cleaning schedule.
This can cause crashes when switching savegame.
Move job merge/apply out of destructor into separate function.
8 years ago
Jonathan G Rennison fa261207ae Link graph GUI: Fix poor contrast in graph legend window cargo labels.
Select foreground colour depending on brightness of background.
8 years ago
Jonathan G Rennison 55057110a5 Linkgraph GUI: Add hover tool-tips to graph legend window. 8 years ago
Jonathan G Rennison 1cede8431f Linkgraph: Support running multiple jobs per spawned thread. 8 years ago
Jonathan G Rennison 84e61b690a Linkgraph: Changes to job scheduling algorithm.
This is to improve responsiveness of link graph updates, whilst
avoiding being blocked waiting for updates to complete.
Previously, large numbers of cheap jobs resulted in poor responsiveness
as it took a long time for jobs to cycle round.

Add 'linkgraph' debug category.
8 years ago
frosch 3f75b8bca2 (svn r27670) -Add: [FS#6471] Assign descriptive names to (GNU pthread) threads. (JGR) 8 years ago
Jonathan G Rennison b8a89437a1 Enable use of atomic store/load on clang. 8 years ago
Jonathan G Rennison 9ea018abc5 Merge branch 'cargo_type_order' into jgrpp
# Conflicts:
#	src/order_base.h
#	src/order_gui.cpp
#	src/order_type.h
#	src/saveload/extended_ver_sl.cpp
#	src/saveload/extended_ver_sl.h
#	src/vehicle_base.h
8 years ago
Jonathan G Rennison 6031cca2d7 Refactor Link Refresher cargo mask handling.
Add some separate helper functions.
Move cargo checks out of LinkRefresher::Run.
8 years ago
Jonathan G Rennison e90b266af1 De-duplicate cargo masking boilerplate using C++11. 8 years ago
Jonathan G Rennison 3507b51d9e Initial LinkRefresher support for cargo-specific links. 8 years ago
Jonathan G Rennison 7b56097f50 Merge branch 'master' into jgrpp
# Conflicts:
#	config.lib
#	src/linkgraph/demands.cpp
#	src/linkgraph/mcf.cpp
#	src/linkgraph/refresh.cpp
#	src/linkgraph/refresh.h
#	src/smallmap_gui.cpp
8 years ago
fonsinchen ff96590312 (svn r27614) -Codechange: Use a fixed array instead of a map for link refresher cargo capacities. (JGR) 8 years ago
fonsinchen a81b7a24a6 (svn r27613) -Codechange: Use a flat vector instead of a map in FlowEdgeIterator. (JGR) 8 years ago
fonsinchen 6b2eed0a70 (svn r27612) -Codechange: Replace three uses of std::list with std::queue/vector. (JGR) 8 years ago
fonsinchen 8d5566651b (svn r27611) -Codechange: Cache the calculated value of CapacityAnnotation 8 years ago
Jonathan G Rennison 61ff4f5d97 Limit linkgraph recalc interval to minimum of 2 ticks.
The interval could otherwise fall to 1 tick at very high day lengths,
and low number of days interval, with recalc not scaled by day length
enabled.
9 years ago
Jonathan G Rennison 78cf5ca682 Add setting for linkgraph times to be in non daylength scaled days.
Savegame format change for link graph jobs.
Change link graph scheduler to support more than one operation
per day, on _date_fract ticks other than SPAWN_JOIN_TICK.
9 years ago
Jonathan G Rennison 3896952136 Join more than one link graph job at once where possible.
This can occur when the link graph recalculation times are changed.
In particular, if the duration or interval are reduced, the new jobs
will be delayed until the completion of the previous long job,
and then remain backlogged thereafter as jobs are dequeued at the same
rate as they are queued.
9 years ago
Jonathan G Rennison 548ea31e83 Fix compilation on gcc before 4.7 due to use of atomic builtins. 9 years ago
Jonathan G Rennison 58b6bf16c3 Linkgraph: Enable MCF custom allocator only for GCC 4.9+
Earlier compilers don't use std::allocator_traits to query allocators.
9 years ago
Jonathan G Rennison e22e1df939 Store annotation and node ID in set key, to reduce ptr derefs on sort.
Store the set iterator in the node, for faster erasing during forks.

Use a custom pool allocator to store set nodes contiguously.
9 years ago
Jonathan G Rennison 4534812b4f Use a fixed array instead of a map for link refresher cargo capacities. 9 years ago
Jonathan G Rennison 0fb79a8f15 Use a flat vector instead of a map in FlowEdgeIterator.
This reduced the cost of Dijkstra<CapacityAnnotation> by approx. 25%,
in a test profiling.
9 years ago
Jonathan G Rennison a3768d3a29 Label threads with a descriptive name where supported (pthreads). 9 years ago
Jonathan G Rennison 3a28be7841 Linkgraph: Replace three uses of std::list with std::deque/vector. 9 years ago
Jonathan G Rennison 564744d427 Cache the calculated value of CapacityAnnotation.
This is because CapacityAnnotation::Comparator::operator()
was appearing at the top of profiler output due to regenerating
the annotation value on every comparison when performing a set operation.
9 years ago
Jonathan G Rennison c6854afcef Pause the game instead of blocking when link graph jobs lag.
Check if the job is still running one date fract tick before it
is due to join and if so pause the game until its done.
This avoids the main thread being blocked on a thread join.
Show if pause is due to link graph job in status bar, update network
messages.
This does not apply for network clients.
9 years ago
frosch a14b836bf2 (svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects. 10 years ago
rubidium 0c2f4bdc2b (svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces) 10 years ago
rubidium 26574124b1 (svn r27002) -Fix-ish: replace some non-ASCII characters with ASCII characters, e.g. @þaram to @param 10 years ago
fonsinchen 78df68e695 (svn r26891) -Codechange: Add methods to retrieve flows from a FlowStatMap 10 years ago
fonsinchen ce9d75f517 (svn r26889) -Feature: Predict links for station-autorefitting vehicles 10 years ago
fonsinchen ef2caa02b2 (svn r26646) -Fix [FS#6041]: Save locations instead of distances in link graphs to reduce size. 10 years ago
rubidium fb9dbf30fa (svn r26580) -Codechange: s/GES_PICKUP/GES_RATING/ (it has nothing to do with actual pickup), s/acceptance_pickup/status/ (the enum isn't called GoodEntryStatus for a reason; it's not only acceptance and pickup anymore) 11 years ago