]> git.tdb.fi Git - r2c2.git/blobdiff - source/libmarklin/train.cpp
Foundations of using physics simulation for trains
[r2c2.git] / source / libmarklin / train.cpp
index f05799265ef9e186c3f553ffc28f6a045ec3d6c9..8ddb66bee3c5047a7c287a6925220d3456a1af0b 100644 (file)
@@ -9,10 +9,13 @@ Distributed under the GPL
 #include <msp/strings/formatter.h>
 #include <msp/time/units.h>
 #include <msp/time/utils.h>
+#include "aicontrol.h"
+#include "catalogue.h"
 #include "driver.h"
 #include "layout.h"
 #include "locotype.h"
 #include "route.h"
+#include "simplephysics.h"
 #include "tracktype.h"
 #include "train.h"
 #include "vehicle.h"
@@ -27,8 +30,10 @@ Train::Train(Layout &l, const LocoType &t, unsigned a):
        loco_type(t),
        address(a),
        pending_block(0),
-       target_speed(0),
+       control(new AIControl(*this, new SimplePhysics)),
+       active(false),
        current_speed(0),
+       speed_changing(false),
        reverse(false),
        functions(0),
        route(0),
@@ -36,7 +41,6 @@ Train::Train(Layout &l, const LocoType &t, unsigned a):
        end_of_route(false),
        status("Unplaced"),
        travel_dist(0),
-       travel_speed(0),
        pure_speed(false),
        real_speed(15)
 {
@@ -81,44 +85,30 @@ const Vehicle &Train::get_vehicle(unsigned i) const
        return *vehicles[i];
 }
 
-void Train::set_speed(unsigned speed)
+void Train::set_control(const string &n, float v)
 {
-       if(speed==target_speed)
-               return;
-       travel_speed = static_cast<int>(round(get_real_speed(speed)*87*3.6/5))*5;
-
-       target_speed = speed;
-       if(!target_speed)
-       {
-               pending_block = 0;
-               stop_timeout = Time::now()+(800+current_speed*150)*Time::msec;
-       }
-       else
-               reserve_more();
-
-       signal_target_speed_changed.emit(target_speed);
-
-       update_speed();
-       pure_speed = false;
+       control->set_control(n, v);
+       signal_control_changed.emit(n, control->get_control(n).value);
 }
 
-void Train::set_reverse(bool rev)
+void Train::set_active(bool a)
 {
-       if(rev==reverse)
+       if(a==active)
                return;
+       if(!a && control->get_speed())
+               throw InvalidState("Can't deactivate while moving");
 
-       if(target_speed)
+       active = a;
+       if(active)
        {
-               set_speed(0);
-               return;
+               stop_timeout = Time::TimeStamp();
+               reserve_more();
+       }
+       else
+       {
+               stop_timeout = Time::now()+2*Time::sec;
+               set_status("Stopped");
        }
-       else if(stop_timeout)
-               return;
-
-       layout.get_driver().set_loco_reverse(address, rev);
-
-       release_blocks(rsv_blocks);
-       reverse_blocks(cur_blocks);
 }
 
 void Train::set_function(unsigned func, bool state)
@@ -164,8 +154,8 @@ void Train::set_route(const Route *r)
                }
        }
 
-       if(target_speed && reserve_more()<2)
-               update_speed();
+       if(active)
+               reserve_more();
 
        signal_route_changed.emit(route);
 }
@@ -175,7 +165,7 @@ void Train::go_to(const Track &to)
        for(list<BlockRef>::const_iterator i=cur_blocks.begin(); i!=cur_blocks.end(); ++i)
                if(i->block->get_tracks().count(const_cast<Track *>(&to)))
                {
-                       set_speed(0);
+                       signal_arrived.emit();
                        set_route(0);
                        return;
                }
@@ -198,12 +188,14 @@ void Train::go_to(const Track &to)
 
 void Train::place(Block &block, unsigned entry)
 {
-       if(target_speed)
-               set_speed(0);
+       if(control->get_speed())
+               throw InvalidState("Must be stopped before placing");
 
        release_blocks(rsv_blocks);
        release_blocks(cur_blocks);
 
+       set_active(false);
+
        if(!block.reserve(this))
        {
                set_status("Unplaced");
@@ -224,8 +216,6 @@ void Train::place(Block &block, unsigned entry)
                const Block::Endpoint &bep = block.get_endpoints()[entry];
                vehicles.front()->place(bep.track, bep.track_ep, 0, Vehicle::BACK_BUFFER);
        }
-
-       set_status("Stopped");
 }
 
 bool Train::free_block(Block &block)
@@ -238,7 +228,6 @@ bool Train::free_block(Block &block)
                        if(nsens<1)
                                return false;
                        release_blocks(rsv_blocks, i, rsv_blocks.end());
-                       update_speed();
                        return true;
                }
                else if(i->block->get_sensor_id())
@@ -259,17 +248,89 @@ int Train::get_entry_to_block(Block &block) const
        return -1;
 }
 
+float Train::get_reserved_distance() const
+{
+       Vehicle &veh = *(reverse ? vehicles.back() : vehicles.front());
+       const VehicleType &vtype = veh.get_type();
+
+       Track *track = veh.get_track();
+       unsigned entry = veh.get_entry();
+
+       float result = -vtype.get_length()/2;
+       if(reverse)
+       {
+               entry = track->traverse(entry);
+               result += veh.get_offset();
+       }
+       else
+               result -= veh.get_offset();
+
+       bool first = true;
+       list<BlockRef>::const_iterator block = cur_blocks.begin();
+       while(1)
+       {
+               if(!first || !reverse)
+                       result += track->get_type().get_path_length(track->get_active_path());
+               first = false;
+
+               unsigned exit = track->traverse(entry);
+               Track *next = track->get_link(exit);
+
+               while(!block->block->get_tracks().count(next))
+               {
+                       ++block;
+                       if(block==cur_blocks.end())
+                               block = rsv_blocks.begin();
+                       if(block==rsv_blocks.end())
+                               return result;
+               }
+
+               entry = next->get_endpoint_by_link(*track);
+               track = next;
+       }
+}
+
 void Train::tick(const Time::TimeStamp &t, const Time::TimeDelta &dt)
 {
-       if(stop_timeout && t>=stop_timeout)
+       if(!active && stop_timeout && t>=stop_timeout)
        {
                release_blocks(rsv_blocks);
                end_of_route = false;
                stop_timeout = Time::TimeStamp();
        }
 
-       if(current_speed)
+       control->tick(dt);
+       float speed = control->get_speed();
+       unsigned speed_notch = find_speed(abs(speed));
+
+       if(speed && (speed<0)!=reverse)
+       {
+               layout.get_driver().set_loco_reverse(address, speed<0);
+               reverse = speed<0;
+
+               release_blocks(rsv_blocks);
+               reverse_blocks(cur_blocks);
+
+               reserve_more();
+       }
+       if(speed_notch!=current_speed && !speed_changing)
+       {
+               speed_changing = true;
+               layout.get_driver().set_loco_speed(address, speed_notch);
+
+               pure_speed = false;
+
+               if(speed_notch)
+                       set_status(format("Traveling %d kmh", get_travel_speed()));
+               else
+                       set_status("Waiting");
+       }
+
+       if(speed)
        {
+               if(!active)
+                       set_active(true);
+
                Track *track = vehicles[0]->get_track();
 
                bool ok = false;
@@ -308,15 +369,12 @@ void Train::save(list<DataFile::Statement> &st) const
                st.push_back((DataFile::Statement("route"), route->get_name()));
 }
 
-void Train::loco_speed_event(unsigned addr, unsigned speed, bool rev)
+void Train::loco_speed_event(unsigned addr, unsigned speed, bool)
 {
        if(addr==address)
        {
                current_speed = speed;
-               reverse = rev;
-
-               signal_speed_changed.emit(current_speed);
-               signal_reverse_changed.emit(reverse);
+               speed_changing = false;
        }
 }
 
@@ -349,12 +407,12 @@ void Train::sensor_event(unsigned addr, bool state)
                {
                        // Compute speed and update related state
                        float travel_time_secs = (Time::now()-last_entry_time)/Time::sec;
-                       travel_speed = static_cast<int>(round(travel_dist/travel_time_secs*87*3.6/5))*5;
 
                        if(pure_speed)
                        {
                                RealSpeed &rs = real_speed[current_speed];
                                rs.add(travel_dist/travel_time_secs, travel_time_secs);
+                               set_status(format("Traveling %d kmh", get_travel_speed()));
                        }
 
                        travel_dist = 0;
@@ -399,16 +457,14 @@ void Train::sensor_event(unsigned addr, bool state)
                        cur_blocks.splice(cur_blocks.end(), rsv_blocks, rsv_blocks.begin(), i);
 
                        // Try to get more blocks if we're moving
-                       if(target_speed)
+                       if(active)
                        {
                                unsigned nsens = reserve_more();
                                if(!nsens && end_of_route)
                                {
-                                       set_speed(0);
+                                       signal_arrived.emit();
                                        set_route(0);
                                }
-                               else if(nsens<2)
-                                       update_speed();
                        }
                }
        }
@@ -577,52 +633,9 @@ unsigned Train::reserve_more()
                        last = &rsv_blocks.back();
        }
 
-       if(got_more)
-               update_speed();
-
        return good_sens;
 }
 
-void Train::update_speed()
-{
-       Driver &driver = layout.get_driver();
-
-       unsigned speed;
-       if(!target_speed)
-       {
-               speed = 0;
-               set_status("Stopped");
-       }
-       else
-       {
-               unsigned nsens = 0;
-               for(list<BlockRef>::const_iterator i=rsv_blocks.begin(); i!=rsv_blocks.end(); ++i)
-                       if(i->block->get_sensor_id())
-                               ++nsens;
-
-               unsigned slow_speed = find_speed(0.1);  // 31.3 km/h
-               if(nsens==0)
-               {
-                       speed = 0;
-                       pure_speed = false;
-                       set_status("Blocked");
-               }
-               else if(nsens==1 && target_speed>slow_speed)
-               {
-                       speed = slow_speed;
-                       pure_speed = false;
-                       set_status("Slow");
-               }
-               else
-               {
-                       speed = target_speed;
-                       set_status(format("Traveling %d kmh", travel_speed));
-               }
-       }
-
-       driver.set_loco_speed(address, speed);
-}
-
 float Train::get_real_speed(unsigned i) const
 {
        if(real_speed[i].weight)
@@ -679,6 +692,13 @@ unsigned Train::find_speed(float real) const
        return static_cast<unsigned>(low*(1-f)+high*f+0.5);
 }
 
+float Train::get_travel_speed() const
+{
+       float speed = get_real_speed(current_speed);
+       float scale = layout.get_catalogue().get_scale();
+       return static_cast<int>(round(speed/scale*3.6/5))*5;
+}
+
 void Train::set_status(const string &s)
 {
        status = s;