unsigned Layout::allocate_turnout_id(bool dbl)
{
- unsigned result = next_turnout_id++;
- if(dbl)
- ++next_turnout_id;
+ set<unsigned> used_ids;
+ for(set<Track *>::const_iterator i=tracks.begin(); i!=tracks.end(); ++i)
+ if((*i)->get_turnout_id())
+ used_ids.insert((*i)->get_turnout_id());
+
+ unsigned result = next_turnout_id;
+ while(used_ids.count(result) || (dbl && used_ids.count(result+1)))
+ ++result;
+ next_turnout_id = result+1+dbl;
+
return result;
}
throw KeyError("Unknown block", lexical_cast(id));
}
-Block &Layout::get_block_by_track(Track &t) const
-{
- for(set<Block *>::const_iterator i=blocks.begin(); i!=blocks.end(); ++i)
- if((*i)->get_tracks().count(&t))
- return **i;
-
- throw InvalidParameterValue("No block found for track");
-}
-
void Layout::create_blocks()
{
set<Track *> used_tracks;
void Layout::create_blocks(Track &track)
{
+ /* Must collect the blocks in a set first while all tracks are still
+ guaranteed to have blocks and to avoid duplicate deletes */
+ set<Block *> del_blocks;
+
+ del_blocks.insert(&track.get_block());
+
const vector<Track *> &links = track.get_links();
- for(set<Block *>::iterator i=blocks.begin(); i!=blocks.end();)
- {
- bool del = (*i)->get_tracks().count(&track);
- for(vector<Track *>::const_iterator j=links.begin(); (!del && j!=links.end()); ++j)
- del = (*i)->get_tracks().count(*j);
-
- if(del)
- delete *i++;
- else
- ++i;
- }
+ for(vector<Track *>::const_iterator i=links.begin(); i!=links.end(); ++i)
+ if(*i)
+ del_blocks.insert(&(*i)->get_block());
+
+ for(set<Block *>::iterator i=del_blocks.begin(); i!=del_blocks.end(); ++i)
+ delete *i;
create_blocks();
}
add("base", &Layout::base);
add("route", static_cast<void (Loader::*)()>(&Loader::route));
add("route", static_cast<void (Loader::*)(const string &)>(&Loader::route));
- add("track", &Loader::track);
- add("train", &Loader::train);
+ add("track", static_cast<void (Loader::*)(unsigned)>(&Loader::track));
+ add("track", static_cast<void (Loader::*)(ArticleNumber)>(&Loader::track));
+ add("train", static_cast<void (Loader::*)(unsigned, unsigned)>(&Loader::train));
+ add("train", static_cast<void (Loader::*)(ArticleNumber, unsigned)>(&Loader::train));
}
void Layout::Loader::finish()
}
void Layout::Loader::track(unsigned art_nr)
+{
+ track(ArticleNumber(art_nr));
+}
+
+void Layout::Loader::track(ArticleNumber art_nr)
{
Track *trk = new Track(obj, obj.catalogue.get_track(art_nr));
load_sub(*trk);
}
void Layout::Loader::train(unsigned art_nr, unsigned addr)
+{
+ train(ArticleNumber(art_nr), addr);
+}
+
+void Layout::Loader::train(ArticleNumber art_nr, unsigned addr)
{
Train *trn = new Train(obj, obj.catalogue.get_vehicle(art_nr), addr);
load_sub(*trn);