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

2016-07-24 10:16:55 +01:00

..

demands.cpp

(svn r27612) -Codechange: Replace three uses of std::list with std::queue/vector. (JGR)

2016-07-10 11:57:16 +00:00

demands.h

(svn r25355) -Add: demand handler for link graph

2013-06-09 12:59:51 +00:00

flowmapper.cpp

Add setting for linkgraph times to be in non daylength scaled days.

2016-01-29 00:26:47 +00:00

flowmapper.h

(svn r26166) -Fix: Scale flows only after mapping to avoid rounding errors.

2013-12-20 14:57:44 +00:00

init.h

(svn r25354) -Add: link graph schedule and typedefs for LinkGraph and related classes

2013-06-09 12:58:37 +00:00

linkgraph_base.h

(svn r25354) -Add: link graph schedule and typedefs for LinkGraph and related classes

2013-06-09 12:58:37 +00:00

linkgraph_gui.cpp

(svn r26891) -Codechange: Add methods to retrieve flows from a FlowStatMap

2014-09-21 16:19:52 +00:00

linkgraph_gui.h

(svn r27612) -Codechange: Replace three uses of std::list with std::queue/vector. (JGR)

2016-07-10 11:57:16 +00:00

linkgraph_type.h

(svn r26549) -Change: better estimation for link capacities during full load

2014-05-01 14:50:52 +00:00

linkgraph.cpp

(svn r26646) -Fix [FS#6041]: Save locations instead of distances in link graphs to reduce size.

2014-06-14 13:35:39 +00:00

linkgraph.h

(svn r26646) -Fix [FS#6041]: Save locations instead of distances in link graphs to reduce size.

2014-06-14 13:35:39 +00:00

linkgraphjob_base.h

(svn r25354) -Add: link graph schedule and typedefs for LinkGraph and related classes

2013-06-09 12:58:37 +00:00

linkgraphjob.cpp

Add setting for linkgraph times to be in non daylength scaled days.

2016-01-29 00:26:47 +00:00

linkgraphjob.h

Add setting for linkgraph times to be in non daylength scaled days.

2016-01-29 00:26:47 +00:00

linkgraphschedule.cpp

Limit linkgraph recalc interval to minimum of 2 ticks.

2016-01-31 12:22:03 +00:00

linkgraphschedule.h

Pause the game instead of blocking when link graph jobs lag.

2015-09-03 18:36:30 +01:00

mcf.cpp

Merge branch 'master' into jgrpp

2016-07-24 10:16:55 +01:00

mcf.h

(svn r25356) -Add: Multi-Commodity-Flow solver for link graph

2013-06-09 13:00:41 +00:00

refresh.cpp

(svn r27614) -Codechange: Use a fixed array instead of a map for link refresher cargo capacities. (JGR)

2016-07-10 12:17:00 +00:00

refresh.h

(svn r27614) -Codechange: Use a fixed array instead of a map for link refresher cargo capacities. (JGR)

2016-07-10 12:17:00 +00:00