b8a89437a1
Enable use of atomic store/load on clang.
8 years ago
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
6031cca2d7
Refactor Link Refresher cargo mask handling.
...
Add some separate helper functions.
Move cargo checks out of LinkRefresher::Run.
8 years ago
e90b266af1
De-duplicate cargo masking boilerplate using C++11.
8 years ago
3507b51d9e
Initial LinkRefresher support for cargo-specific links.
8 years ago
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
ff96590312
(svn r27614) -Codechange: Use a fixed array instead of a map for link refresher cargo capacities. (JGR)
8 years ago
a81b7a24a6
(svn r27613) -Codechange: Use a flat vector instead of a map in FlowEdgeIterator. (JGR)
8 years ago
6b2eed0a70
(svn r27612) -Codechange: Replace three uses of std::list with std::queue/vector. (JGR)
8 years ago
8d5566651b
(svn r27611) -Codechange: Cache the calculated value of CapacityAnnotation
8 years ago
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
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
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
548ea31e83
Fix compilation on gcc before 4.7 due to use of atomic builtins.
9 years ago
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
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
4534812b4f
Use a fixed array instead of a map for link refresher cargo capacities.
9 years ago
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
a3768d3a29
Label threads with a descriptive name where supported (pthreads).
9 years ago
3a28be7841
Linkgraph: Replace three uses of std::list with std::deque/vector.
9 years ago
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
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
a14b836bf2
(svn r27178) -Fix [FS#5969]: Data race due to lazy initialisation of objects.
10 years ago
0c2f4bdc2b
(svn r27020) -Cleanup: some coding style consistency improvements (mostly spaces)
10 years ago
26574124b1
(svn r27002) -Fix-ish: replace some non-ASCII characters with ASCII characters, e.g. @þaram to @param
10 years ago
78df68e695
(svn r26891) -Codechange: Add methods to retrieve flows from a FlowStatMap
10 years ago
ce9d75f517
(svn r26889) -Feature: Predict links for station-autorefitting vehicles
10 years ago
ef2caa02b2
(svn r26646) -Fix [FS#6041]: Save locations instead of distances in link graphs to reduce size.
10 years ago
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
b8381b6b25
(svn r26549) -Change: better estimation for link capacities during full load
11 years ago
547e8233be
(svn r26484) -Change: Remove demand calculation based on tiles.
11 years ago
2be4215f43
(svn r26482) -Codechange: add an include that allows us to undefine/redefine "unsafe" functions to prevent them from being used, and thus having to care about certain aspects of their return values
11 years ago
8395c08738
(svn r26448) -Fix [FS#5970]: Avoid division by 0 when scaling flow values.
11 years ago
d6097956a5
(svn r26445) -Change [FS#5961]: Draw links to match _settings_game.vehicle.road_side (M3Henry)
11 years ago
e4385f1423
(svn r26411) -Change [FS#5941]: Use better distance metric for link graph (MildaIV)
11 years ago
3570104d24
(svn r26393) -Fix: Update distances between link graph nodes when station sign is moved
11 years ago
ebcba0c0e3
(svn r26347) -Fix [FS#5898]: Make sure link graph jobs can delete themselves after SLA_NULL.
11 years ago
537975b794
(svn r26341) -Fix [FS#5902]: Reroute cargo when automatic distribution is switched off.
11 years ago
86ebb981f1
(svn r26331) -Fix: some inconsistencies regarding link graph (job) IDs.
11 years ago
b31a1119fb
(svn r26286) -Fix: Thoroughly erase dead flows.
11 years ago
21a5571d07
(svn r26283) -Fix [FS#5878]: Prevent infinite recursion also in RefreshLinks.
11 years ago
cd68a2d8a5
(svn r26276) -Fix [FS#5874]: Don't spawn link graph jobs for link graphs with only one node
11 years ago
ced1bfa60f
(svn r26266) -Fix [FS#5860]: Update smallmap overlay if player joins different company and make sure company masks are valid
11 years ago
fea3a433b2
(svn r26166) -Fix: Scale flows only after mapping to avoid rounding errors.
11 years ago
05b50ada5c
(svn r25963) -Fix [FS#5758]: Mixtures of old and new flows could create cycles.
11 years ago
b83b4ab4c2
(svn r25948) -Fix [FS#5796]: Make sure LinkRefresher doesn't delete the LinkGraph DeleteStaleLinks() is examining.
11 years ago
795e94c87b
(svn r25934) -Fix [FS#5793]: Do not access items from other pools in pool item destructors during pool cleaning.
11 years ago
532744d9ee
(svn r25912) -Fix [FS#5676]: Draw 'shared' links (involving neutral stations) as dashed lines and show them in every company's link graph overlay.
11 years ago
3ebe7e3ef9
(svn r25909) -Fix (r25906): That simplification was a bit too much.
11 years ago
9596352830
(svn r25908) -Fix: Some documentation for constructors of LinkRefresher::Hop.
11 years ago
Jonathan G Rennison
fonsinchen
frosch
rubidium