BasicLoader is now called ObjectLoader

[r2c2.git] / source / libr2c2 / route.cpp

diff --git a/source/libr2c2/route.cpp b/source/libr2c2/route.cpp
index 61117f5e5f851ae75501d9872724137d9ca60ce0..be2eefc258ea8cfc7e135932e9ab325c1611ee96 100644 (file)
--- a/source/libr2c2/route.cpp
+++ b/source/libr2c2/route.cpp
@@ -1,5 +1,7 @@
 #include <queue>
-#include <msp/strings/formatter.h>
+#include <msp/core/maputils.h>
+#include <msp/strings/format.h>
+#include <msp/strings/utils.h>
 #include "layout.h"
 #include "route.h"
 #include "track.h"
@@ -126,6 +128,20 @@ Route *create_route(const TrackIter &from, const Pred &goal)
 
 namespace R2C2 {
 
+string bad_route::get_message(RouteValidityMask valid)
+{
+       const char *reasons[3];
+       unsigned i = 0;
+       if(!(valid&1))
+               reasons[i++] = "unlinked";
+       else if(!(valid&2))
+               reasons[i++] = "branching";
+       else if(!(valid&4))
+               reasons[i++] = "not smooth";
+       return join(reasons, reasons+i, ", ");
+}
+
+
 Route::Route(Layout &l):
        layout(l),
        temporary(false)
@@ -153,13 +169,11 @@ void Route::set_temporary(bool t)
 void Route::set_turnout(unsigned addr, unsigned path)
 {
        if(!addr)
-               throw InvalidParameterValue("Invalid turnout address");
-       map<unsigned, int>::iterator i = turnouts.find(addr);
-       if(i==turnouts.end())
-               throw KeyError("Turnout is not in this route");
-       if(i->second>=0 && path!=static_cast<unsigned>(i->second))
-               throw InvalidState("Setting conflicts with route");
-       i->second = path;
+               throw invalid_argument("Route::set_turnout");
+       int &state = get_item(turnouts, addr);
+       if(state>=0 && path!=static_cast<unsigned>(state))
+               throw logic_error("route conflict");
+       state = path;
 }
 
 void Route::update_turnouts()
@@ -242,13 +256,9 @@ void Route::add_track(Track &trk)
 
        if(!tracks.empty())
        {
-               unsigned valid = check_validity(trk);
-               if(!(valid&1))
-                       throw Exception("Not linked to existing tracks");
-               else if(!(valid&2))
-                       throw Exception("Branching routes not allowed");
-               else if(!(valid&4))
-                       throw Exception("Route must be smooth");
+               RouteValidityMask valid = check_validity(trk);
+               if(valid!=ROUTE_VALID)
+                       throw bad_route(valid);
        }
 
        tracks.insert(&trk);
@@ -264,18 +274,17 @@ void Route::add_tracks(const set<Track *> &trks)
 
        while(!pending.empty())
        {
-               bool found = false;
+               RouteValidityMask valid = ROUTE_INVALID;
                for(set<Track *>::const_iterator i=pending.begin(); i!=pending.end(); ++i)
-                       if(tracks.empty() || check_validity(**i)==7)
+                       if(tracks.empty() || (valid=check_validity(**i))==ROUTE_VALID)
                        {
                                tracks.insert(*i);
                                pending.erase(*i);
-                               found = true;
                                break;
                        }
 
-               if(!found)
-                       throw Exception("Could not add all tracks to route");
+               if(valid!=ROUTE_VALID)
+                       throw bad_route(valid);
        }
 
        update_turnouts();
@@ -320,9 +329,9 @@ void Route::save(list<DataFile::Statement> &st) const
                st.push_back((DataFile::Statement("turnout"), i->first, i->second));
 }
 
-unsigned Route::check_validity(Track &trk) const
+RouteValidityMask Route::check_validity(Track &trk) const
 {
-       unsigned result = 4;
+       unsigned result = ROUTE_SMOOTH;
        const vector<Track *> &links = trk.get_links();
        for(vector<Track *>::const_iterator i=links.begin(); i!=links.end(); ++i)
        {
@@ -332,7 +341,7 @@ unsigned Route::check_validity(Track &trk) const
                        continue;
 
                // Linked to an existing track - good
-               result |= 1;
+               result |= ROUTE_LINKED;
 
                if(unsigned tid = (*i)->get_turnout_id())
                {
@@ -342,7 +351,7 @@ unsigned Route::check_validity(Track &trk) const
                        {
                                // Linking to a turnout with path set is only good if we're continuing that path
                                if(ep.paths&(1<<path))
-                                       result |= 2;
+                                       result |= ROUTE_LINEAR;
                        }
                        else
                        {
@@ -367,20 +376,20 @@ unsigned Route::check_validity(Track &trk) const
                                                const TrackType::Endpoint &ep2 = (*i)->get_type().get_endpoint(j);
                                                if(!(ep.paths&ep2.paths))
                                                        // Impossible path through the turnout - not good
-                                                       result &= 3;
+                                                       result &= ~ROUTE_SMOOTH;
                                        }
 
                                // Only good if at most one other track is linked to the turnout
                                if(count<=1)
-                                       result |= 2;
+                                       result |= ROUTE_LINEAR;
                        }
                }
                else
                        // Linked to something linear - good
-                       result |= 2;
+                       result |= ROUTE_LINEAR;
        }
 
-       return result;
+       return static_cast<RouteValidityMask>(result);
 }
 
 void Route::track_removed(Track &t)
@@ -410,7 +419,7 @@ Route *Route::find(const TrackIter &from, const set<Track *> &to)
 
 
 Route::Loader::Loader(Route &r):
-       DataFile::BasicLoader<Route>(r)
+       DataFile::ObjectLoader<Route>(r)
 {
        add("name",    &Route::name);
        add("turnout", &Loader::turnout);