X-Git-Url: http://git.tdb.fi/?a=blobdiff_plain;f=source%2Flibr2c2%2Flayout.cpp;h=46a43a8353fffd8cccc266f418dbaa7bb117bcd3;hb=ab64a17394440c3cb18d0b30d75fb4ed6297a6b4;hp=a4c7309e472fc30d122b0a532508813cf212be37;hpb=3e60e64dc914badcd3ead3e6c4a5c3f08204cebe;p=r2c2.git

diff --git a/source/libr2c2/layout.cpp b/source/libr2c2/layout.cpp
index a4c7309..46a43a8 100644
--- a/source/libr2c2/layout.cpp
+++ b/source/libr2c2/layout.cpp
@@ -13,8 +13,10 @@
 #include "signal.h"
 #include "signaltype.h"
 #include "track.h"
+#include "trackcircuit.h"
 #include "tracktype.h"
 #include "train.h"
+#include "vehicle.h"
 #include "vehicletype.h"
 #include "zone.h"
 
@@ -37,7 +39,9 @@ Layout::Layout(Catalogue &c, Driver *d):
 	catalogue(c),
 	driver(d),
 	next_turnout_id(0x800)
-{ }
+{
+	clock.set_rate(60);
+}
 
 Layout::~Layout()
 {
@@ -46,14 +50,11 @@ Layout::~Layout()
 
 	while(!trains.empty())
 		delete trains.begin()->second;
-	while(!routes.empty())
-		delete *routes.begin();
-	while(!zones.empty())
-		delete *zones.begin();
-	while(!tracks.empty())
-		delete *tracks.begin();
-	while(!blocks.empty())
-		delete *blocks.begin();
+	track_chains.del<Route>();
+	track_chains.del<Zone>();
+	objects.del<Signal>();
+	objects.del<Track>();
+	track_chains.del<Block>();
 }
 
 Driver &Layout::get_driver() const
@@ -63,36 +64,154 @@ Driver &Layout::get_driver() const
 	return *driver;
 }
 
-void Layout::add_track(Track &t)
+void Layout::add(Object &o)
+{
+	if(objects.insert(o))
+		signal_object_added.emit(o);
+}
+
+void Layout::add(Track &t)
 {
-	if(tracks.insert(&t).second)
+	if(objects.insert(t))
 	{
+		// Blocks must be recreated first
 		create_blocks();
-		signal_track_added.emit(t);
+		signal_object_added.emit(t);
+	}
+}
+
+void Layout::add(TrackChain &g)
+{
+	if(track_chains.insert(g))
+		signal_track_chain_added.emit(g);
+}
+
+void Layout::add(Block &b)
+{
+	if(track_chains.insert(b))
+	{
+		b.signal_reserved.connect(sigc::bind<0>(signal_block_reserved, sigc::ref(b)));
+		signal_track_chain_added.emit(b);
+	}
+}
+
+void Layout::add(Sensor &s)
+{
+	if(sensors.insert(s))
+	{
+		s.signal_state_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Layout::sensor_state_changed), sigc::ref(s)));
+		s.signal_state_changed.connect(sigc::bind<0>(signal_sensor_state_changed, sigc::ref(s)));
 	}
 }
 
-Track *Layout::pick_track(const Vector &start, const Vector &ray)
+template<>
+const set<Object *> &Layout::get_all<Object>() const
+{
+	return objects.get();
+}
+
+template<>
+const set<Track *> &Layout::get_all<Track>() const
+{
+	return objects.get<Track>();
+}
+
+template<>
+const set<Signal *> &Layout::get_all<Signal>() const
+{
+	return objects.get<Signal>();
+}
+
+template<>
+const set<Vehicle *> &Layout::get_all<Vehicle>() const
+{
+	return objects.get<Vehicle>();
+}
+
+template<>
+const set<TrackChain *> &Layout::get_all<TrackChain>() const
 {
-  for(set<Track *>::iterator i=tracks.begin(); i!=tracks.end(); ++i)
-     if((*i)->collide_ray(start, ray))
-        return *i;
+	return track_chains.get();
+}
+
+template<>
+const set<Block *> &Layout::get_all<Block>() const
+{
+	return track_chains.get<Block>();
+}
+
+template<>
+const set<Route *> &Layout::get_all<Route>() const
+{
+	return track_chains.get<Route>();
+}
+
+template<>
+const set<Zone *> &Layout::get_all<Zone>() const
+{
+	return track_chains.get<Zone>();
+}
+
+template<>
+const set<Sensor *> &Layout::get_all<Sensor>() const
+{
+	return sensors.get<Sensor>();
+}
+
+template<>
+const set<TrackCircuit *> &Layout::get_all<TrackCircuit>() const
+{
+	return sensors.get<TrackCircuit>();
+}
+
+template<typename T>
+T *Layout::pick(const Ray &ray)
+{
+	const set<Object *> &objs = objects.get();
+	for(set<Object *>::const_iterator i=objs.begin(); i!=objs.end(); ++i)
+		if(T *t = dynamic_cast<T *>(*i))
+			if(t->collide_ray(ray))
+				return t;
 
 	return 0;
 }
 
-void Layout::remove_track(Track &t)
+template Object *Layout::pick<Object>(const Ray &);
+template Track *Layout::pick<Track>(const Ray &);
+template Signal *Layout::pick<Signal>(const Ray &);
+template Vehicle *Layout::pick<Vehicle>(const Ray &);
+
+void Layout::remove(Object &o)
+{
+	if(objects.erase(o))
+		signal_object_removed.emit(o);
+}
+
+void Layout::remove(Track &t)
 {
-	if(tracks.erase(&t))
+	if(objects.erase(t))
 	{
+		// Blocks must be recreated first
 		create_blocks(t);
-		signal_track_removed.emit(t);
+		signal_object_removed.emit(t);
 	}
 }
 
+void Layout::remove(TrackChain &g)
+{
+	if(track_chains.erase(g))
+		signal_track_chain_removed.emit(g);
+}
+
+void Layout::remove(Sensor &s)
+{
+	sensors.erase(s);
+}
+
 unsigned Layout::allocate_turnout_id()
 {
 	set<unsigned> used_ids;
+	const set<Track *> &tracks = objects.get<Track>();
 	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		if((*i)->get_turnout_id())
 			used_ids.insert((*i)->get_turnout_id());
@@ -105,31 +224,9 @@ unsigned Layout::allocate_turnout_id()
 	return result;
 }
 
-void Layout::add_signal(Signal &s)
-{
-	if(signals.insert(&s).second)
-		signal_signal_added.emit(s);
-}
-
-void Layout::remove_signal(Signal &s)
-{
-	if(signals.erase(&s))
-		signal_signal_removed.emit(s);
-}
-
-void Layout::add_block(Block &b)
-{
-	blocks.insert(&b);
-	b.signal_reserved.connect(sigc::bind<0>(signal_block_reserved, sigc::ref(b)));
-	if(b.get_sensor_id())
-	{
-		b.signal_state_changed.connect(sigc::bind<0>(sigc::mem_fun(this, &Layout::block_state_changed), sigc::ref(b)));
-		b.signal_state_changed.connect(sigc::bind<0>(signal_block_state_changed, sigc::ref(b)));
-	}
-}
-
 Block &Layout::get_block(unsigned id) const
 {
+	const set<Block *> &blocks = track_chains.get<Block>();
 	for(set<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
 		if((*i)->get_id()==id)
 			return **i;
@@ -140,12 +237,14 @@ Block &Layout::get_block(unsigned id) const
 void Layout::create_blocks()
 {
 	set<Track *> used_tracks;
-	for(set<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
+	const set<Block *> *blocks = &track_chains.get<Block>();
+	for(set<Block *>::const_iterator i=blocks->begin(); i!=blocks->end(); ++i)
 	{
 		const set<Track *> &btracks = (*i)->get_tracks();
 		used_tracks.insert(btracks.begin(), btracks.end());
 	}
 
+	const set<Track *> &tracks = objects.get<Track>();
 	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		if(used_tracks.count(*i)==0)
 		{
@@ -153,8 +252,9 @@ void Layout::create_blocks()
 			used_tracks.insert(block->get_tracks().begin(), block->get_tracks().end());
 		}
 
-	for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
-		for(set<Block *>::iterator j=i; j!=blocks.end(); ++j)
+	blocks = &track_chains.get<Block>();
+	for(set<Block *>::iterator i=blocks->begin(); i!=blocks->end(); ++i)
+		for(set<Block *>::iterator j=i; j!=blocks->end(); ++j)
 			if(j!=i)
 				(*i)->check_link(**j);
 }
@@ -178,19 +278,9 @@ void Layout::create_blocks(Track &track)
 	create_blocks();
 }
 
-void Layout::remove_block(Block &b)
-{
-	blocks.erase(&b);
-}
-
-void Layout::add_route(Route &r)
-{
-	if(routes.insert(&r).second)
-		signal_route_added.emit(r);
-}
-
 Route &Layout::get_route(const string &name) const
 {
+	const set<Route *> &routes = track_chains.get<Route>();
 	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
 		if((*i)->get_name()==name)
 			return **i;
@@ -199,26 +289,16 @@ Route &Layout::get_route(const string &name) const
 
 void Layout::update_routes()
 {
+	const set<Route *> &routes = track_chains.get<Route>();
 	for(set<Route *>::iterator i=routes.begin(); i!=routes.end(); ++i)
 		(*i)->update_turnouts();
 }
 
-void Layout::remove_route(Route &r)
-{
-	if(routes.erase(&r))
-		signal_route_removed.emit(r);
-}
-
-void Layout::add_zone(Zone &z)
-{
-	if(zones.insert(&z).second)
-		signal_zone_added.emit(z);
-}
-
 Layout::ZoneArray Layout::get_zones(const string &group) const
 {
 	ZoneArray result;
-	for(ZoneSet::const_iterator i=zones.begin(); i!=zones.end(); ++i)
+	const set<Zone *> &zones = track_chains.get<Zone>();
+	for(set<Zone *>::const_iterator i=zones.begin(); i!=zones.end(); ++i)
 		if((*i)->get_group()==group)
 			result.push_back(*i);
 
@@ -229,19 +309,14 @@ Layout::ZoneArray Layout::get_zones(const string &group) const
 
 Zone &Layout::get_zone(const string &group, unsigned num) const
 {
-	for(ZoneSet::const_iterator i=zones.begin(); i!=zones.end(); ++i)
+	const set<Zone *> &zones = track_chains.get<Zone>();
+	for(set<Zone *>::const_iterator i=zones.begin(); i!=zones.end(); ++i)
 		if((*i)->get_group()==group && (*i)->get_number()==num)
 			return **i;
 
 	throw key_error(format("%s %d", group, num));
 }
 
-void Layout::remove_zone(Zone &z)
-{
-	if(zones.erase(&z))
-		signal_zone_removed.emit(z);
-}
-
 void Layout::add_train(Train &t)
 {
 	insert_unique(trains, t.get_address(), &t);
@@ -259,18 +334,6 @@ void Layout::remove_train(Train &t)
 		signal_train_removed.emit(t);
 }
 
-void Layout::add_vehicle(Vehicle &v)
-{
-	if(vehicles.insert(&v).second)
-		signal_vehicle_added.emit(v);
-}
-
-void Layout::remove_vehicle(Vehicle &v)
-{
-	if(vehicles.erase(&v))
-		signal_vehicle_removed.emit(v);
-}
-
 void Layout::tick()
 {
 	if(driver)
@@ -282,12 +345,15 @@ void Layout::tick()
 		dt = t-last_tick;
 	last_tick = t;
 
-	for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end(); ++i)
+	clock.tick(dt);
+
+	for(set<Sensor *>::iterator i=sensors.get().begin(); i!=sensors.get().end(); ++i)
 		(*i)->tick(dt);
+	const set<Signal *> &signals = objects.get<Signal>();
 	for(set<Signal *>::iterator i=signals.begin(); i!=signals.end(); ++i)
 		(*i)->tick(dt);
 	for(map<unsigned, Train *>::iterator i=trains.begin(); i!=trains.end(); ++i)
-		i->second->tick(t, dt);
+		i->second->tick(dt);
 }
 
 void Layout::emergency(const string &msg)
@@ -306,6 +372,7 @@ void Layout::save(const string &fn) const
 	if(!base.empty())
 		writer.write((DataFile::Statement("base"), base));
 
+	const set<Track *> &tracks = objects.get<Track>();
 	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 	{
 		DataFile::Statement st("track");
@@ -314,6 +381,7 @@ void Layout::save(const string &fn) const
 		writer.write(st);
 	}
 
+	const set<Signal *> &signals = objects.get<Signal>();
 	for(set<Signal *>::const_iterator i=signals.begin(); i!=signals.end(); ++i)
 	{
 		DataFile::Statement st("signal");
@@ -322,6 +390,7 @@ void Layout::save(const string &fn) const
 		writer.write(st);
 	}
 
+	const set<Route *> &routes = track_chains.get<Route>();
 	for(set<Route *>::const_iterator i=routes.begin(); i!=routes.end(); ++i)
 	{
 		if((*i)->is_temporary())
@@ -332,7 +401,8 @@ void Layout::save(const string &fn) const
 		writer.write(st);
 	}
 
-	for(ZoneSet::const_iterator i=zones.begin(); i!=zones.end(); ++i)
+	const set<Zone *> &zones = track_chains.get<Zone>();
+	for(set<Zone *>::const_iterator i=zones.begin(); i!=zones.end(); ++i)
 	{
 		DataFile::Statement st("zone");
 		(*i)->save(st.sub);
@@ -345,6 +415,7 @@ void Layout::save_dynamic(const string &fn) const
 	IO::BufferedFile out(fn, IO::M_WRITE);
 	DataFile::Writer writer(out);
 
+	const set<Track *> &tracks = objects.get<Track>();
 	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		if(unsigned tid = (*i)->get_turnout_id())
 			writer.write((DataFile::Statement("turnout"), tid, (*i)->get_active_path()));
@@ -360,10 +431,70 @@ void Layout::save_dynamic(const string &fn) const
 	}
 }
 
-void Layout::block_state_changed(Block &block, Block::State state)
+void Layout::sensor_state_changed(Sensor &sensor, Sensor::State state)
+{
+	if(state==Sensor::ACTIVE)
+	{
+		Block *block = 0;
+		if(TrackCircuit *tc = dynamic_cast<TrackCircuit *>(&sensor))
+			block = &tc->get_block();
+
+		if(block && !block->get_train())
+			emergency(format("Unreserved sensor %d triggered", sensor.get_address()));
+	}
+}
+
+
+template<typename B>
+Layout::Storage<B>::~Storage()
+{
+	while(!base.empty())
+		delete *base.begin();
+}
+
+template<typename B>
+bool Layout::Storage<B>::insert(B &b)
+{
+	bool result = base.insert(&b).second;
+	if(result)
+		caches.clear();
+	return result;
+}
+
+template<typename B>
+bool Layout::Storage<B>::erase(B &b)
 {
-	if(state==Block::ACTIVE && !block.get_train())
-		emergency(format("Unreserved sensor %d triggered", block.get_sensor_id()));
+	bool result = base.erase(&b);
+	if(result)
+		caches.clear();
+	return result;
+}
+
+template<typename B>
+template<typename T>
+const set<T *> &Layout::Storage<B>::get() const
+{
+	for(list<Variant>::const_iterator i=caches.begin(); i!=caches.end(); ++i)
+		if(i->check_type<set<T *> >())
+			return i->value<set<T *> >();
+
+	caches.push_back(set<T *>());
+	set<T *> &result = caches.back().value<set<T *> >();
+	for(typename set<B *>::const_iterator i=base.begin(); i!=base.end(); ++i)
+		if(T *t = dynamic_cast<T *>(*i))
+			result.insert(t);
+
+	return result;
+}
+
+template<typename B>
+template<typename T>
+void Layout::Storage<B>::del()
+{
+	set<T *> ts = get<T>();
+	for(typename set<T *>::iterator i=ts.begin(); i!=ts.end(); ++i)
+		if(base.count(*i))
+			delete *i;
 }
 
 
@@ -385,12 +516,6 @@ Layout::Loader::Loader(Layout &l):
 	add("train", static_cast<void (Loader::*)(unsigned, unsigned, const std::string &)>(&Loader::train));
 }
 
-void Layout::Loader::finish()
-{
-	for(set<Track *>::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i)
-		(*i)->check_slope();
-}
-
 void Layout::Loader::route()
 {
 	Route *rte = new Route(obj);
@@ -420,9 +545,10 @@ void Layout::Loader::track(ArticleNumber art_nr)
 	Track *trk = new Track(obj, obj.catalogue.get_track(art_nr));
 	load_sub(*trk);
 	new_tracks = true;
-	for(set<Track *>::iterator i=obj.tracks.begin(); i!=obj.tracks.end(); ++i)
+	const set<Track *> &tracks = obj.objects.get<Track>();
+	for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
 		if(*i!=trk)
-			trk->snap_to(**i, true);
+			trk->link_to(**i);
 }
 
 void Layout::Loader::train(unsigned art_nr, unsigned addr, const std::string &proto)